summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorGianfranco Costamagna <costamagnagianfranco@yahoo.it>2016-06-13 16:16:40 (GMT)
committerGianfranco Costamagna <costamagnagianfranco@yahoo.it>2016-06-13 16:16:40 (GMT)
commit260abfbcbf34a376eacbee2a21b8bb2a1f896260 (patch)
tree10d64e039736df49d6da9227b44be92a7597549e /debian/patches
parent1579e4b561bf396502b9bdadaf53d1b3d97bb80a (diff)
Upload to unstable, with the gcc-5.4 and gcc-6.1 build failures fixeddebian/5.0.20-dfsg-3
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/fix-detect-gcc-5.4.patch20
-rw-r--r--debian/patches/series1
2 files changed, 21 insertions, 0 deletions
diff --git a/debian/patches/fix-detect-gcc-5.4.patch b/debian/patches/fix-detect-gcc-5.4.patch
new file mode 100644
index 0000000..d7869ca
--- /dev/null
+++ b/debian/patches/fix-detect-gcc-5.4.patch
@@ -0,0 +1,20 @@
+Description: Fix detect version of gcc. Update to gcc 5.4 and 6.1.
+Author: Mateusz Łukasik <mati75@linuxmint.pl>
+Bug-Debian: https://bugs.debian.org/827193
+
+--- a/configure
++++ b/configure
+@@ -430,10 +430,10 @@ check_gcc()
+ -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 9 \) \
+- -o \( $cc_maj -eq 5 -a $cc_min -gt 3 \) \
+- -o \( $cc_maj -eq 6 -a $cc_min -gt 0 \) \
++ -o \( $cc_maj -eq 5 -a $cc_min -gt 9 \) \
++ -o \( $cc_maj -eq 6 -a $cc_min -gt 1 \) \
+ -o $cc_maj -gt 6 ]; then
+- log_failure "gcc version $cc_maj.$cc_min found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<10 or gcc 5.3"
++ log_failure "gcc version $cc_maj.$cc_min found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<10, gcc 5.x with x<10 or gcc 6.x with x<2"
+ fail really
+ else
+ log_success "found version $cc_ver"
diff --git a/debian/patches/series b/debian/patches/series
index 0591094..360189a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@
36-fix-vnc-version-string.patch
fix-gcc-pie.patch
fix-kernel-4.7.patch
+fix-detect-gcc-5.4.patch