[Pkg-virtualbox-commits] [virtualbox] 01/01: Fix build with gcc-4.9 (the good way)

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository virtualbox.

commit c99131682ec336405e06731176408f949b68b3e3
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Feb 23 14:17:20 2015 +0100

    Fix build with gcc-4.9 (the good way)
---
 debian/changelog                             |  7 +++++++
 debian/patches/38-remove-hardcoded-gcc.patch | 15 ---------------
 debian/patches/series                        |  1 -
 debian/rules                                 |  6 +++---
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d4ab738..c3ee60d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+virtualbox (4.3.22-dfsg-2) UNRELEASED; urgency=medium
+
+  * Remove d/p/38-remove-hardcoded-gcc.patch, use --with-gcc and
+    --with-g++ configure flags.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Mon, 23 Feb 2015 13:49:58 +0100
+
 virtualbox (4.3.22-dfsg-1) experimental; urgency=medium
 
   [ Gianfranco Costamagna ]
diff --git a/debian/patches/38-remove-hardcoded-gcc.patch b/debian/patches/38-remove-hardcoded-gcc.patch
deleted file mode 100644
index 994f434..0000000
--- a/debian/patches/38-remove-hardcoded-gcc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/configure b/configure
-index 83fa74c..b2da518 100755
---- a/configure
-+++ b/configure
-@@ -101,10 +101,8 @@ BUILD_LIBCURL=
- BUILD_LIBSSL=
- BUILD_LIBVPX=
- PASSIVE_MESA=0
--CC="gcc"
- CC32=""
- CC64=""
--CXX="g++"
- CXX32=""
- CXX64=""
- YASM="yasm"
diff --git a/debian/patches/series b/debian/patches/series
index 5e391ca..ae622e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,4 +15,3 @@
 35-libvdeplug-soname.patch
 36-fix-vnc-version-string.patch
 37-fix-build.patch
-38-remove-hardcoded-gcc.patch
diff --git a/debian/rules b/debian/rules
index e47543d..f80c731 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-export CC=gcc-4.9
-export CXX=g++-4.9
 # Name of the source packages
 psource:=virtualbox-source
 gsource:=virtualbox-guest-source
@@ -53,7 +51,9 @@ endif
 	    --disable-kmods \
 	    --enable-webservice \
 	    --enable-vde \
-	    --enable-vnc
+	    --enable-vnc \
+	    --with-gcc=gcc-4.9 \
+	    --with-g++=g++-4.9
 
 override_dh_auto_build:
 	# Building package

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git