rpms/VirtualBox/devel VirtualBox-OSE-4.0.0-32bit.patch, 1.4, 1.5 VirtualBox.spec, 1.22, 1.23

[Sérgio M. Basto]

Author: sergiomb

Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8421

Modified Files:
	VirtualBox-OSE-4.0.0-32bit.patch VirtualBox.spec 
Log Message:
* Fri Sep 07 2012 Sérgio Basto <sergio at serjux.com> - 4.2.0-0.5.RC3
- not drop 32-bit patch, on x86_64 as quick resolution of not have glic-devel.i686 on x86_64.


VirtualBox-OSE-4.0.0-32bit.patch:
 configure                              |    2 +-
 src/VBox/Devices/testcase/Makefile.kmk |    8 ++++++++
 src/VBox/VMM/testcase/Makefile.kmk     |   13 ++++++++++---
 3 files changed, 19 insertions(+), 4 deletions(-)

Index: VirtualBox-OSE-4.0.0-32bit.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-OSE-4.0.0-32bit.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VirtualBox-OSE-4.0.0-32bit.patch	7 Sep 2012 15:15:58 -0000	1.4
+++ VirtualBox-OSE-4.0.0-32bit.patch	8 Sep 2012 01:25:16 -0000	1.5
@@ -22,7 +22,7 @@
 -  [ "$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
+   #[ $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
@@ -67,26 +67,24 @@
  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
+--- a/src/VBox/VMM/testcase/Makefile.kmk.32bit	2012-07-18 09:58:08.000000000 +0100
++++ b/src/VBox/VMM/testcase/Makefile.kmk	2012-09-02 04:04:34.551296386 +0100
+@@ -21,9 +21,11 @@ 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
+-PROGRAMS   += tstVMStructSize tstAsmStructs
+-ifdef VBOX_WITH_RAW_MODE
+- PROGRAMS  += tstVMStructRC tstAsmStructsRC
++ifneq ($(KBUILD_HOST_ARCH),amd64)
++ PROGRAMS   += tstVMStructSize tstAsmStructs
++ ifdef VBOX_WITH_RAW_MODE
++  PROGRAMS  += tstVMStructRC tstAsmStructsRC
++ endif
  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)
+ if !defined(VBOX_ONLY_EXTPACKS) \
+  && (   defined(VBOX_WITH_DTRACE_R3) \
+@@ -77,16 +79,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)),)
@@ -108,6 +106,3 @@
  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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- VirtualBox.spec	7 Sep 2012 15:15:58 -0000	1.22
+++ VirtualBox.spec	8 Sep 2012 01:25:16 -0000	1.23
@@ -34,7 +34,9 @@
 Patch2:     VirtualBox-4.1.18-strings.patch
 Patch3:     VirtualBox-4.2.0-libcxx.patch
 Patch5:     VirtualBox-4.2.0-xorg17.patch
+%ifarch x86_64
 Patch10:	VirtualBox-OSE-4.0.0-32bit.patch
+%endif
 Patch15:    VirtualBox-OSE-4.0.0-makeself.patch
 Patch17:    VirtualBox-OSE-4.0.0-beramono.patch
 Patch18:    VirtualBox-OSE-4.0.2-aiobug.patch
@@ -178,8 +180,10 @@
 %patch2 -p1 -b .strings
 %patch3 -p1 -b .libcxx
 %patch5 -p1 -b .xorg17
-%patch10 -p1 -b .32bit
 %patch15 -p1 -b .makeself
+%ifarch x86_64
+%patch10 -p1 -b .32bit
+%endif
 %patch17 -p1 -b .beramono
 %patch18 -p1 -b .aiobug
 %if 0%{?fedora} < 16
@@ -554,7 +558,7 @@
 
 %changelog
 * Fri Sep 07 2012 Sérgio Basto <sergio at serjux.com> - 4.2.0-0.5.RC3
-- not drop 32-bit patch, as a quick resolution.
+- not drop 32-bit patch, on x86_64 as quick resolution of not have glic-devel.i686 on x86_64.
 
 * Fri Sep 07 2012 Sérgio Basto <sergio at serjux.com> - 4.2.0-0.4.RC3
 - Also Compile guest drives vboxvideo_drv and vboxmouse_drv with X11 sources from system.