d/patches/allow_gcc5 (new): Allow compilation with GCC 5, per upstream.

(Closes: #778021.)

diff --git a/debian/changelog b/debian/changelog
index 827a144a018f5745b14ef59880fb505ed33fbf2f..21bc0a92b9b9bdebfad4e69db2ff0f7ffbdcf738 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 ncbi-blast+ (2.2.30-2) UNRELEASED; urgency=medium
 
   * NOT YET RELEASED.
+  * d/patches/allow_gcc5 (new): Allow compilation with GCC 5, per upstream.
+    (Closes: #778021.)
 
- -- Aaron M. Ucko <ucko@debian.org>  Mon, 16 Feb 2015 22:29:29 -0500
+ -- Aaron M. Ucko <ucko@debian.org>  Mon, 16 Feb 2015 22:38:37 -0500
 
 ncbi-blast+ (2.2.30-1) experimental; urgency=medium
 

diff --git a/debian/patches/allow_gcc5 b/debian/patches/allow_gcc5
new file mode 100644 (file)
index 0000000..ea7a602
--- /dev/null
+++ b/debian/patches/allow_gcc5
@@ -0,0 +1,47 @@
+Subject: allow compilation with GCC 5
+Description: Formally allow compilation with GCC 5, otherwise okay
+Author: Aaron M. Ucko <ucko@debian.org>
+Forwarded: yes
+Last-Updated: 2015-02-16
+--- a/c++/src/build-system/configure
++++ b/c++/src/build-system/configure
+@@ -5819,14 +5819,10 @@ ncbi_compiler_ver="0"
+ 
+ if test "$GCC" = "yes" ; then
+    compiler_ver="`$real_CXX -dumpversion 2>&1`"
+-   case "$compiler_ver" in
+-     2.95* | 2.96* | 3.* | 4.* )
+-       compiler="GCC"
+-       ncbi_compiler="GCC"
+-       ncbi_compiler_ver="$compiler_ver"
+-                 WithFeatures="$WithFeatures${WithFeaturesSep}GCC"; WithFeaturesSep=" "
+-       ;;
+-   esac
++   compiler="GCC"
++   ncbi_compiler="GCC"
++   ncbi_compiler_ver="$compiler_ver"
++             WithFeatures="$WithFeatures${WithFeaturesSep}GCC"; WithFeaturesSep=" "
+ elif test "$KCC" = "yes" ; then
+    compiler_ver="$kcc_ver"
+    compiler="KCC"
+--- a/c++/src/build-system/configure.ac
++++ b/c++/src/build-system/configure.ac
+@@ -800,14 +800,10 @@ ncbi_compiler_ver="0"
+ 
+ if test "$GCC" = "yes" ; then
+    compiler_ver="`$real_CXX -dumpversion 2>&1`"
+-   case "$compiler_ver" in
+-     2.95* | 2.96* | 3.* | 4.* )
+-       compiler="GCC"
+-       ncbi_compiler="GCC"
+-       ncbi_compiler_ver="$compiler_ver"
+-       NCBI_FEATURE(GCC)
+-       ;;
+-   esac
++   compiler="GCC"
++   ncbi_compiler="GCC"
++   ncbi_compiler_ver="$compiler_ver"
++   NCBI_FEATURE(GCC)
+ elif test "$KCC" = "yes" ; then
+    compiler_ver="$kcc_ver"
+    compiler="KCC"

diff --git a/debian/patches/series b/debian/patches/series
index 8d79322c4bd72175f175fa49663deb877a2afe8c..74dbdd0e19f40d207d8316baa7b0f8ee7cde21af 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ use_pie_for_apps
 skip_services_unit_test
 fix_configure
 fix_compilation
+allow_gcc5