[Pkg-virtualbox-commits] [virtualbox] 01/01: Fix ftbfs with gcc4.9

[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 6c455b11ad1131fe59fb7b0ae073915b969ba5d7
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Mon Jul 14 10:04:17 2014 +0200

    Fix ftbfs with gcc4.9
---
 debian/changelog                           |  3 +++
 debian/patches/fix-ftbfs-with-gcc4.9.patch | 18 ++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d406a28..0dd5a2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 virtualbox (4.3.12-dfsg-2) UNRELEASED; urgency=medium
 
+  [ Gianfranco Costamagna ]
   * Add get-orig-source rules target, to fully comply with
     debian policy. (Closes: #699141), thanks Dmitry!
+  [ Mateusz Łukasik ]
+  * Add fix-ftbfs-with-gcc4.9.patch. (Closes: #754220)
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 02 Jul 2014 12:44:15 +0200
 
diff --git a/debian/patches/fix-ftbfs-with-gcc4.9.patch b/debian/patches/fix-ftbfs-with-gcc4.9.patch
new file mode 100644
index 0000000..1d45f06
--- /dev/null
+++ b/debian/patches/fix-ftbfs-with-gcc4.9.patch
@@ -0,0 +1,18 @@
+Description: Fix FTBFS with gcc-4.9
+Author: Mateusz Łukasik <mati75 at linuxmint.pl>
+Bug-Debian: http://bugs.debian.org/754220
+
+--- a/configure
++++ b/configure
+@@ -415,9 +415,9 @@ check_gcc()
+       elif [ $cc_maj -lt 3 \
+              -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
+              -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
+-             -o \( $cc_maj -eq 4 -a $cc_min -gt 8 \) \
++             -o \( $cc_maj -eq 4 -a $cc_min -gt 9 \) \
+              -o $cc_maj -gt 4 ]; then
+-        log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<8"
++        log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<9"
+         fail really
+       else
+         log_success "found version $cc_ver"
diff --git a/debian/patches/series b/debian/patches/series
index 5b32c83..2066813 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
 32-disable-guest-version-check.patch
 35-libvdeplug-soname.patch
 36-fix-vnc-version-string.patch
+fix-ftbfs-with-gcc4.9.patch

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