[med-svn] r19592 - in trunk/packages/rcsb-core-wrapper/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-07-10 16:39:33 +0000 (Fri, 10 Jul 2015)
New Revision: 19592

Added:
   trunk/packages/rcsb-core-wrapper/trunk/debian/patches/gcc5.patch
Modified:
   trunk/packages/rcsb-core-wrapper/trunk/debian/changelog
   trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series
Log:
Fix GCC version detection


Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/changelog
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/changelog	2015-07-10 10:07:27 UTC (rev 19591)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/changelog	2015-07-10 16:39:33 UTC (rev 19592)
@@ -1,8 +1,11 @@
 librcsb-core-wrapper (1.005-4) UNRELEASED; urgency=medium
 
   * cme fix dpkg-control
+  * Fix GCC version detection (thanks for the patch to Matthias Klose
+    <doko at debian.org>)
+    Closes: #777971
 
- -- Andreas Tille <tille at debian.org>  Mon, 06 Jul 2015 09:39:03 +0200
+ -- Andreas Tille <tille at debian.org>  Fri, 10 Jul 2015 18:35:49 +0200
 
 librcsb-core-wrapper (1.005-3) unstable; urgency=medium
 

Added: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/gcc5.patch
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/gcc5.patch	                        (rev 0)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/gcc5.patch	2015-07-10 16:39:33 UTC (rev 19592)
@@ -0,0 +1,15 @@
+Author: Matthias Klose <doko at debian.org>
+Last-Updated: Fri, 10 Jul 2015 14:05:17 +0200
+Description: Do not force failure in case of higher GCC > 4.x
+
+--- a/etc/platform.sh
++++ b/etc/platform.sh
+@@ -67,7 +67,7 @@ case `uname -s` in
+ #   Check if it is a Linux platform
+     Linux)
+ #     Check if it is GCC version 4.x
+-      gcc_ver=`gcc --version | grep -e " 4\."`
++      gcc_ver=`gcc --version | grep -e " [456789]\."`
+       if [[ -z $gcc_ver ]]
+       then
+ #       It is not GCC version 4.x. Check if it is GCC version 3.x

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series	2015-07-10 10:07:27 UTC (rev 19591)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series	2015-07-10 16:39:33 UTC (rev 19592)
@@ -12,3 +12,4 @@
 exit-in-shlib
 make_test_target
 regcomp_cert_fix.patch
+gcc5.patch