[med-svn] [Git][med-team/librcsb-core-wrapper][master] Replace gcc5.patch with platformcheck.patch to bypass problematic gcc version...

[Juhani Numminen]

Juhani Numminen pushed to branch master at Debian Med / librcsb-core-wrapper


Commits:
30df6908 by Juhani Numminen at 2021-01-15T11:30:32+02:00
Replace gcc5.patch with platformcheck.patch to bypass problematic gcc version check. Closes: #957471

- - - - -


4 changed files:

- debian/changelog
- − debian/patches/gcc5.patch
- + debian/patches/platformcheck.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,14 @@
 librcsb-core-wrapper (1.005-9) UNRELEASED; urgency=medium
 
+  [ Michael R. Crusoe ]
   * Team upload.
   * Accept patch from Ubuntu to fix build. Closes: #973249
     Thanks to Steve Langasek <steve.langasek at ubuntu.com>
 
+  [ Juhani Numminen ]
+  * Replace gcc5.patch with platformcheck.patch to bypass problematic
+    gcc version check. Closes: #957471
+
  -- Michael R. Crusoe <crusoe at debian.org>  Mon, 30 Nov 2020 10:09:24 +0100
 
 librcsb-core-wrapper (1.005-8) unstable; urgency=medium


=====================================
debian/patches/gcc5.patch deleted
=====================================
@@ -1,15 +0,0 @@
-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


=====================================
debian/patches/platformcheck.patch
=====================================
@@ -0,0 +1,53 @@
+Author: Juhani Numminen <juhaninumminen0 at gmail.com>
+Last-Updated: Fri, 15 Jan 2021 11:00:36 +0200
+Description: Set sysid=gnu4 on Debian, don't do gcc version grepping
+Bug-Debian: https://bugs.debian.org/957471
+
+--- a/etc/platform.sh
++++ b/etc/platform.sh
+@@ -66,33 +66,18 @@
+ 
+ #   Check if it is a Linux platform
+     Linux)
+-#     Check if it is GCC version 4.x
+-      gcc_ver=`gcc --version | grep -e " 4\."`
+-      if [[ -z $gcc_ver ]]
+-      then
+-#       It is not GCC version 4.x. Check if it is GCC version 3.x
+-        gcc_ver=`gcc --version | grep -e " 3\."`
+-        if [[ -z $gcc_ver ]]
+-        then
+-#       It is not GCC version 3.x. Check if it is GCC version 2.x
+-          gcc_ver=`gcc --version | grep -e "2\."`
+-          if [[ -z $gcc_ver ]]
+-          then
+-#           It is not GCC version 2.x either. Production can not be compiled.
+-            sysid="unknown"
+-          else
+-#           It is GCC version 2.x
+-            sysid="gnu2"
+-          fi
+-        else
+-#         It is GCC version 3.x
+-          sysid="gnu3"
+-        fi
+-      else
+-#         It is GCC version 4.x
+-          sysid="gnu4"
+-      fi
+-    ;;
++        sysid="gnu4"
++        ;;
++
++#   Debian GNU/kFreeBSD
++    GNU/kFreeBSD)
++        sysid="gnu4"
++        ;;
++
++#   Debian GNU/Hurd
++    GNU)
++        sysid="gnu4"
++        ;;
+ 
+     SunOS)
+ 	    sysid="sunos5"


=====================================
debian/patches/series
=====================================
@@ -12,7 +12,7 @@ spelling
 exit-in-shlib
 make_test_target
 regcomp_cert_fix.patch
-gcc5.patch
+platformcheck.patch
 xerces32.patch
 gcc-8.patch
 python3.patch



View it on GitLab: https://salsa.debian.org/med-team/librcsb-core-wrapper/-/commit/30df69086fc53d7f3b617169c1bb0b1b7e79e382

-- 
View it on GitLab: https://salsa.debian.org/med-team/librcsb-core-wrapper/-/commit/30df69086fc53d7f3b617169c1bb0b1b7e79e382
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210115/422e610a/attachment-0001.html>