[Pkg-virtualbox-commits] r251 - in trunk/debian: . patches

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-04-08 08:34:53 +0000 (Tue, 08 Apr 2008)
New Revision: 251

Added:
   trunk/debian/patches/11-workaround-gcc-ice.dpatch
   trunk/debian/patches/12-gcc-4.3.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
Log:
Made virtualbox compile with gcc 4.3.



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-04-04 18:25:30 UTC (rev 250)
+++ trunk/debian/changelog	2008-04-08 08:34:53 UTC (rev 251)
@@ -1,3 +1,11 @@
+virtualbox-ose (1.5.6-dfsg-6) unstable; urgency=low
+
+  * Added two patches from upstream SVN to make virtualbox-ose build with
+    gcc-4.3. However, this compiler is not yet officially supported.
+    Closes: #474907
+
+ -- Michael Meskes <meskes at debian.org>  Tue, 08 Apr 2008 09:58:35 +0200
+
 virtualbox-ose (1.5.6-dfsg-5) unstable; urgency=low
 
   [ Hilko Bengen ]

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2008-04-04 18:25:30 UTC (rev 250)
+++ trunk/debian/patches/00list	2008-04-08 08:34:53 UTC (rev 251)
@@ -8,4 +8,5 @@
 08-init-fail.dpatch
 09-init-lsb.dpatch
 10-initscript.dpatch
-
+11-workaround-gcc-ice
+12-gcc-4.3

Added: trunk/debian/patches/11-workaround-gcc-ice.dpatch
===================================================================
--- trunk/debian/patches/11-workaround-gcc-ice.dpatch	                        (rev 0)
+++ trunk/debian/patches/11-workaround-gcc-ice.dpatch	2008-04-08 08:34:53 UTC (rev 251)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11-workaround-gcc-ice.dpatch by Michael Meskes <meskes at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use -O3 wot workaround gcc-4.3 problem
+
+ at DPATCH@
+
+--- virtualbox-ose-1.5.6-dfsg/src/recompiler/Makefile.kmk.orig	2008-04-08 09:35:57.000000000 +0200
++++ virtualbox-ose-1.5.6-dfsg/src/recompiler/Makefile.kmk	2008-04-08 09:36:23.000000000 +0200
+@@ -231,9 +231,9 @@
+ 
+ # Extra flags for these source modules.
+ target-i386/op.c_CFLAGS         = -O2 -fno-strict-aliasing -fomit-frame-pointer -falign-functions=0 -fno-reorder-blocks -fno-optimize-sibling-calls
+-target-i386/op.c_CFLAGS.x86     = -fno-gcse -fno-instrument-functions -mpreferred-stack-boundary=2
++target-i386/op.c_CFLAGS.x86     = -O3 -fno-gcse -fno-instrument-functions -mpreferred-stack-boundary=2
+ target-i386/op.c_CFLAGS.darwin.x86 = -m128bit-long-double -mpreferred-stack-boundary=4
+-target-i386/helper.c_CFLAGS.x86 = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse
++target-i386/helper.c_CFLAGS.x86 = -O3 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse
+ cpu-exec.c_CFLAGS.x86           = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse
+ 
+ 

Added: trunk/debian/patches/12-gcc-4.3.dpatch
===================================================================
--- trunk/debian/patches/12-gcc-4.3.dpatch	                        (rev 0)
+++ trunk/debian/patches/12-gcc-4.3.dpatch	2008-04-08 08:34:53 UTC (rev 251)
@@ -0,0 +1,50 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12-gcc-4.3.dpatch by Michael Meskes <meskes at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Some changes needed by gcc-4.3
+
+ at DPATCH@
+
+--- virtualbox-ose-1.5.6-dfsg/src/VBox/Main/VMMDevInterface.cpp.orig
++++ virtualbox-ose-1.5.6-dfsg/src/VBox/Main/VMMDevInterface.cpp
+@@ -27,6 +27,7 @@
+ #include <VBox/VBoxGuest.h>
+ #include <VBox/shflsvc.h>
+ #include <iprt/asm.h>
++#include <stdio.h>
+ 
+ #ifdef VBOX_HGCM
+ #include "hgcm/HGCM.h"
+--- virtualbox-ose-1.5.6-dfsg/src/VBox/Additions/linux/xclient/main.cpp.orig
++++ virtualbox-ose-1.5.6-dfsg/src/VBox/Additions/linux/xclient/main.cpp
+@@ -30,6 +30,7 @@ using std::endl;
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <getopt.h>
++#include <stdlib.h>
+ 
+ #include <X11/Xlib.h>
+ #include <X11/Intrinsic.h>
+--- virtualbox-ose-1.5.6-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp.orig
++++ virtualbox-ose-1.5.6-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp
+@@ -28,6 +28,8 @@
+ #include "VBoxRegistrationDlg.h"
+ #endif
+ 
++#include <stdlib.h>
++
+ #include <qapplication.h>
+ #include <qmessagebox.h>
+ #include <qpixmap.h>
+--- virtualbox-ose-1.5.6-dfsg/src/recompiler/InnoTek/op-validate.sed.orig
++++ virtualbox-ose-1.5.6-dfsg/src/recompiler/InnoTek/op-validate.sed
+@@ -63,6 +63,8 @@ s/^[[:blank:]]*ret[[:blank:]]*\n*[[:blan
+ /\.Lfe[0-9][0-9]*:/d
+ /\.LFE[0-9][0-9]*:/d
+ /size[[:space:]]/d
++/p2align[[:space:]]/d
++/^[/#][[:space:]]0[[:space:]]\"\"[[:space:]]2[[:space:]]*$/d
+ /^[/#]NO_APP[[:space:]]*$/d
+ /^$/!b bad
+ b end