Author: lkundrak Update of /cvs/free/rpms/VirtualBox-OSE/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv27941 Modified Files: VirtualBox-OSE.spec Added Files: VirtualBox-OSE-3.0.4-noansi.patch Log Message: Fix x86_64 build VirtualBox-OSE-3.0.4-noansi.patch: --- NEW FILE VirtualBox-OSE-3.0.4-noansi.patch --- On Rawhide as of 01 Sep 2009 x86_64 /usr/include/bits/mathinline.h contains a non-iso/ansi c inline assembly construct. Lubomir Rintel <lkundrak(a)v3.sk&gt; diff -up VirtualBox-3.0.4_OSE/src/libs/xpcom18a4/Makefile.kmk.noansi VirtualBox-3.0.4_OSE/src/libs/xpcom18a4/Makefile.kmk --- VirtualBox-3.0.4_OSE/src/libs/xpcom18a4/Makefile.kmk.noansi 2009-09-01 09:32:07.000000000 -0600 +++ VirtualBox-3.0.4_OSE/src/libs/xpcom18a4/Makefile.kmk 2009-09-01 09:33:27.000000000 -0600 @@ -79,7 +79,7 @@ TEMPLATE_XPCOM_CFLAGS.release = -O TEMPLATE_XPCOM_CFLAGS.profile = -O TEMPLATE_XPCOM_CFLAGS.freebsd = -pthread TEMPLATE_XPCOM_CFLAGS.l4 = -nostdinc -TEMPLATE_XPCOM_CFLAGS.linux = -pthread -ansi +TEMPLATE_XPCOM_CFLAGS.linux = -pthread TEMPLATE_XPCOM_CFLAGS.solaris = -fno-omit-frame-pointer # for now anyway. TEMPLATE_XPCOM_DEFS = MOZILLA_CLIENT=1 NDEBUG=1 _IMPL_NS_COM \ XPCOM_DLL_BASE=\"$(basename $(notdir $(LIB_XPCOM)))\" \ diff -up VirtualBox-3.0.4_OSE/Config.kmk.noansi VirtualBox-3.0.4_OSE/Config.kmk --- VirtualBox-3.0.4_OSE/Config.kmk.noansi 2009-09-01 10:03:45.000000000 -0600 +++ VirtualBox-3.0.4_OSE/Config.kmk 2009-09-01 10:12:21.000000000 -0600 @@ -3517,7 +3517,7 @@ if1of ($(KBUILD_TARGET), dragonfly freeb TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.x86 = -m elf_i386 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64 = -m elf_x86_64 endif -TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fno-merge-constants -std=c99 +TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fno-merge-constants -std=gnu99 TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-merge-constants TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o TEMPLATE_VBOXGUESTR3XF86MOD_LIBS = \ @@ -3533,7 +3533,7 @@ TEMPLATE_VBOXGUESTR3XORGMOD = VBox TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS = VBOXGUESTR3DLL TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE) TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE) -TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_CFLAGS) -std=c99 +TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_CFLAGS) -std=gnu99 TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR ifeq ($(KBUILD_TARGET_ARCH),amd64) TEMPLATE_VBOXGUESTR3XORGMOD_DEFS += _XSERVER64 Index: VirtualBox-OSE.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- VirtualBox-OSE.spec 1 Sep 2009 07:33:17 -0000 1.30 +++ VirtualBox-OSE.spec 1 Sep 2009 16:37:58 -0000 1.31 @@ -50,6 +50,7 @@ Patch9: VirtualBox-OSE-3.0.4-optflags.patch Patch10: VirtualBox-OSE-2.2.0-32bit.patch Patch11: VirtualBox-OSE-3.0.4-visibility.patch +Patch12: VirtualBox-OSE-3.0.4-noansi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -154,6 +155,7 @@ %patch9 -p1 -b .optflags %patch10 -p1 -b .32bit %patch11 -p1 -b .visibility +%patch12 -p1 -b .noansi # Remove prebuilt binary tools rm -rf kBuild @@ -450,6 +452,7 @@ %changelog * Sat Aug 22 2009 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 3.0.4-7 - Correct the path in udev rule and adjust for non-hardening +- Fix build with recent x86_64 glibc * Thu Aug 20 2009 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 3.0.4-6 - No exceptions in R0 code, should fix unresolved symbol problem