File gcc10.patch of Package opendune
From 7e2dd872bb28514c3bddd6bd625df812be45aba5 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Wed, 24 Mar 2021 18:08:10 +0100
Subject: [PATCH 1/2] fix parsing of gcc version greater than 9.
because 10 has two digits
---
config.lib | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config.lib b/config.lib
index 7824dfc26..c479fb034 100644
--- a/config.lib
+++ b/config.lib
@@ -605,7 +605,7 @@ make_compiler_cflags() {
if [ `basename $1 | cut -c 1-3` = "icc" ]; then
# Enable some things only for certain ICC versions
- cc_version=`$1 -dumpversion | cut -c 1-4 | sed s@\\\.@@g`
+ cc_version=`$1 -dumpversion | cut -d. -f 1-2 | sed s@\\\.@@g`
flags="$flags -rdynamic"
ldflags="$ldflags -rdynamic"
@@ -736,7 +736,7 @@ make_compiler_cflags() {
ldflags="$ldflags -rdynamic"
else
# Enable some things only for certain GCC versions
- cc_version=`$1 -dumpversion | cut -c 1,3`
+ cc_version=`$1 -dumpversion | cut -d. -f 1-2 | sed s@\\\.@@g`
if [ $(echo -n "$cc_version" | wc -c) -eq 1 ] ; then
# add a 0 if the version had only one digit
cc_version="${cc_version}0"
From 411c3a9d2608767f6491d2f2da441bcb84fe64d4 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Thu, 25 Mar 2021 09:21:06 +0100
Subject: [PATCH 2/2] fix for gcc 10
fixes #356
---
config.lib | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/config.lib b/config.lib
index c479fb034..757bda4a8 100644
--- a/config.lib
+++ b/config.lib
@@ -736,8 +736,11 @@ make_compiler_cflags() {
ldflags="$ldflags -rdynamic"
else
# Enable some things only for certain GCC versions
- cc_version=`$1 -dumpversion | cut -d. -f 1-2 | sed s@\\\.@@g`
- if [ $(echo -n "$cc_version" | wc -c) -eq 1 ] ; then
+ cc_version=`$1 -dumpversion | cut -d. -f 1-2`
+ if echo "$cc_version" | grep -q '\.' ; then
+ # remove the dot
+ cc_version=`echo "$cc_version" | sed s@\\\.@@g`
+ else
# add a 0 if the version had only one digit
cc_version="${cc_version}0"
fi
