Author: sergiomb Update of /cvs/free/rpms/VirtualBox/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2227 Modified Files: VirtualBox.spec Added Files: VirtualBox-OSE-4.0.0-32bit.patch Log Message: * Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-0.5.RC3 - not drop 32-bit patch, as a quick resolution. VirtualBox-OSE-4.0.0-32bit.patch: configure | 2 +- src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++ src/VBox/VMM/testcase/Makefile.kmk | 10 +++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) Index: VirtualBox-OSE-4.0.0-32bit.patch =================================================================== RCS file: VirtualBox-OSE-4.0.0-32bit.patch diff -N VirtualBox-OSE-4.0.0-32bit.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ VirtualBox-OSE-4.0.0-32bit.patch 7 Sep 2012 15:15:58 -0000 1.4 @@ -0,0 +1,113 @@ +From a9548501755beeec6fa11b0c261f167164a4ee70 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel <lkundrak(a)v3.sk&gt; +Date: Fri, 26 Mar 2010 04:44:55 +0100 +Subject: [PATCH] Build on x86_64 without 32bit toolchain. + +This disables the check for 32bit toolchain and tests that need it +(boo). +--- + configure | 2 +- + src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++ + src/VBox/VMM/testcase/Makefile.kmk | 9 +++++++++ + 3 files changed, 18 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index 42ce775..0932637 100755 +--- a/configure ++++ b/configure +@@ -2525,7 +2525,7 @@ if [ "$OS" = "linux" ]; then + fi + check_libcap + check_compiler_h +- [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit ++ #[ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit + # tools/common/makeself* + [ $OSE -ge 1 ] && check_makeself + fi +diff --git a/src/VBox/Devices/testcase/Makefile.kmk b/src/VBox/Devices/testcase/Makefile.kmk +index 4debf81..59dae0d 100644 +--- a/src/VBox/Devices/testcase/Makefile.kmk ++++ b/src/VBox/Devices/testcase/Makefile.kmk +@@ -45,22 +45,28 @@ VBOX_DEVICES_TESTS_FEATURES = \ + # We setup one 'other' target for executing the structure & alignment + # validation testcases. Perhaps a bit hackish, but extremely useful. + # ++ifneq ($(KBUILD_HOST_ARCH),amd64) + ifeq ($(KBUILD_TARGET),$(KBUILD_HOST)) + ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),) + OTHERS += \ + $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run + endif + endif ++endif + + # The normal testing pass. ++ifneq ($(KBUILD_HOST_ARCH),amd64) + TESTING += \ + $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run ++endif + + ifdef VBOX_WITH_RAW_MODE + # + # The testcase generator. + # ++ifneq ($(KBUILD_HOST_ARCH),amd64) + PROGRAMS += tstDeviceStructSizeRC ++endif + tstDeviceStructSizeRC_TEMPLATE = VBoxRcExe + tstDeviceStructSizeRC_DEFS = $(VBOX_DEVICES_TESTS_FEATURES) + tstDeviceStructSizeRC_SOURCES = tstDeviceStructSizeRC.cpp +@@ -73,7 +79,9 @@ endif # VBOX_WITH_RAW_MODE + # + # The testcase it self. + # ++ifneq ($(KBUILD_HOST_ARCH),amd64) + PROGRAMS += tstDeviceStructSize ++endif + tstDeviceStructSize_TEMPLATE = VBOXR3AUTOTST + tstDeviceStructSize_DEFS = $(VBOX_DEVICES_TESTS_FEATURES) + tstDeviceStructSize_INCS = \ +diff --git a/src/VBox/VMM/testcase/Makefile.kmk b/src/VBox/VMM/testcase/Makefile.kmk +index f947789..95882f1 100644 +--- a/src/VBox/VMM/testcase/Makefile.kmk ++++ b/src/VBox/VMM/testcase/Makefile.kmk +@@ -21,10 +21,14 @@ include $(KBUILD_PATH)/subheader.kmk + # + # Target lists. + # ++ifneq ($(KBUILD_HOST_ARCH),amd64) + PROGRAMS += tstVMStructSize tstAsmStructs ++endif + ifdef VBOX_WITH_RAW_MODE ++ifneq ($(KBUILD_HOST_ARCH),amd64) + PROGRAMS += tstVMStructRC tstAsmStructsRC + endif ++endif + ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS + PROGRAMS += tstGlobalConfig tstInstrEmul + ifdef VBOX_WITH_RAW_MODE +@@ -67,16 +71,21 @@ BLDDIRS += $(VBOX_VMM_TESTCASE_OUT_DIR) + # + ifeq ($(KBUILD_TARGET),$(KBUILD_HOST)) + ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),) ++ ifneq ($(KBUILD_HOST_ARCH),amd64) + OTHERS += \ + $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \ + $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run ++ endif + endif + endif + + # The normal testing pass. ++ ++ifneq ($(KBUILD_HOST_ARCH),amd64) + TESTING += \ + $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \ + $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run ++endif + ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS + TESTING += \ + $(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run +-- +1.7.3.4 + Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- VirtualBox.spec 7 Sep 2012 03:58:22 -0000 1.21 +++ VirtualBox.spec 7 Sep 2012 15:15:58 -0000 1.22 @@ -15,7 +15,7 @@ Name: VirtualBox Version: 4.2.0 -Release: 0.4%{?prerel:.%{prerel}}%{?dist} +Release: 0.5%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware Group: Development/Tools @@ -34,6 +34,7 @@ Patch2: VirtualBox-4.1.18-strings.patch Patch3: VirtualBox-4.2.0-libcxx.patch Patch5: VirtualBox-4.2.0-xorg17.patch +Patch10: VirtualBox-OSE-4.0.0-32bit.patch Patch15: VirtualBox-OSE-4.0.0-makeself.patch Patch17: VirtualBox-OSE-4.0.0-beramono.patch Patch18: VirtualBox-OSE-4.0.2-aiobug.patch @@ -61,7 +62,7 @@ BuildRequires: java-devel >= 1.6 BuildRequires: /usr/bin/pdflatex BuildRequires: libpng-devel -BuildRequires: glibc.i686 glibc-devel.i686 libstdc++.i686 +#BuildRequires: glibc.i686 glibc-devel.i686 libstdc++.i686 #BuildRequires: /usr/lib/libc.so #BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6 @@ -177,6 +178,7 @@ %patch2 -p1 -b .strings %patch3 -p1 -b .libcxx %patch5 -p1 -b .xorg17 +%patch10 -p1 -b .32bit %patch15 -p1 -b .makeself %patch17 -p1 -b .beramono %patch18 -p1 -b .aiobug @@ -551,6 +553,9 @@ %changelog +* Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-0.5.RC3 +- not drop 32-bit patch, as a quick resolution. + * Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-0.4.RC3 - Also Compile guest drives vboxvideo_drv and vboxmouse_drv with X11 sources from system. - Fix ABI/API breakages in X11 1.13.