[Pkg-virtualbox-commits] [virtualbox] 02/03: Build using gcc and g++ 4.9
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Sun Feb 15 10:11:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository virtualbox.
commit ea7c0d77ecf71172d8a8bddfeb05f33ce25ee9dc
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Sun Feb 15 11:04:33 2015 +0100
Build using gcc and g++ 4.9
---
debian/control | 2 ++
debian/patches/38-remove-hardcoded-gcc.patch | 15 +++++++++++++++
debian/patches/series | 1 +
debian/rules | 2 ++
4 files changed, 20 insertions(+)
diff --git a/debian/control b/debian/control
index c226214..8bcabde 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,8 @@ Build-Depends: bzip2,
docbook-xml,
docbook-xsl,
dpkg-dev (>= 1.15.6~),
+ gcc-4.9,
+ g++-4.9,
g++-multilib [amd64],
genisoimage,
gsoap (>= 2.8.16),
diff --git a/debian/patches/38-remove-hardcoded-gcc.patch b/debian/patches/38-remove-hardcoded-gcc.patch
new file mode 100644
index 0000000..994f434
--- /dev/null
+++ b/debian/patches/38-remove-hardcoded-gcc.patch
@@ -0,0 +1,15 @@
+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 ae622e5..5e391ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
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 1f5df85..e47543d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git
More information about the Pkg-virtualbox-commits
mailing list