Skip to content

Commit 7077892

Browse files
committed
patch 8.2.0213: configure does not recognize gcc 10.0 and later
Problem: Configure does not recognize gcc 10.0 and later. Solution: Adjust the pattern matching the version number. (Sergei Trofimovich, closes #5580)
1 parent 07ada5f commit 7077892

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/auto/configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14762,7 +14762,7 @@ DEPEND_CFLAGS_FILTER=
1476214762
if test "$GCC" = yes; then
1476314763
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC 3 or later" >&5
1476414764
$as_echo_n "checking for GCC 3 or later... " >&6; }
14765-
gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'`
14765+
gccmajor=`echo "$gccversion" | sed -e 's/^\([0-9]\+\)\..*$/\1/g'`
1476614766
if test "$gccmajor" -gt "2"; then
1476714767
DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
1476814768
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

src/configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2195,7 +2195,7 @@ else
21952195
fi
21962196

21972197
dnl On my HPUX system the X include dir is found, but the lib dir not.
2198-
dnl This is a desparate try to fix this.
2198+
dnl This is a desperate try to fix this.
21992199

22002200
if test -d "$x_includes" && test ! -d "$x_libraries"; then
22012201
x_libraries=`echo "$x_includes" | sed s/include/lib/`
@@ -4447,7 +4447,7 @@ dnl the number before the version number.
44474447
DEPEND_CFLAGS_FILTER=
44484448
if test "$GCC" = yes; then
44494449
AC_MSG_CHECKING(for GCC 3 or later)
4450-
gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]]\)\..*$/\1/g'`
4450+
gccmajor=`echo "$gccversion" | sed -e 's/^\([[0-9]]\+\)\..*$/\1/g'`
44514451
if test "$gccmajor" -gt "2"; then
44524452
DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
44534453
AC_MSG_RESULT(yes)

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,8 @@ static char *(features[]) =
742742

743743
static int included_patches[] =
744744
{ /* Add new patch number below this line */
745+
/**/
746+
213,
745747
/**/
746748
212,
747749
/**/

0 commit comments

Comments
 (0)