]> granicus.if.org Git - vim/commitdiff
patch 8.2.0213: configure does not recognize gcc 10.0 and later v8.2.0213
authorBram Moolenaar <Bram@vim.org>
Wed, 5 Feb 2020 19:44:24 +0000 (20:44 +0100)
committerBram Moolenaar <Bram@vim.org>
Wed, 5 Feb 2020 19:44:24 +0000 (20:44 +0100)
Problem:    Configure does not recognize gcc 10.0 and later.
Solution:   Adjust the pattern matching the version number. (Sergei
            Trofimovich, closes #5580)

src/auto/configure
src/configure.ac
src/version.c

index 1b5094e972b2f8838f57d253fe9f45586502ab1e..59f3e68d63cf7aa5d2d4fa40ce99683ad135d3e0 100755 (executable)
@@ -14762,7 +14762,7 @@ DEPEND_CFLAGS_FILTER=
 if test "$GCC" = yes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC 3 or later" >&5
 $as_echo_n "checking for GCC 3 or later... " >&6; }
-  gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'`
+  gccmajor=`echo "$gccversion" | sed -e 's/^\([0-9]\+\)\..*$/\1/g'`
   if test "$gccmajor" -gt "2"; then
     DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
index a098da82ec84abec1485ea222f86238cb1988eba..bf10eac5511b9fae61f269c9dc2132f27e690066 100644 (file)
@@ -2195,7 +2195,7 @@ else
   fi
 
   dnl On my HPUX system the X include dir is found, but the lib dir not.
-  dnl This is a desparate try to fix this.
+  dnl This is a desperate try to fix this.
 
   if test -d "$x_includes" && test ! -d "$x_libraries"; then
     x_libraries=`echo "$x_includes" | sed s/include/lib/`
@@ -4447,7 +4447,7 @@ dnl the number before the version number.
 DEPEND_CFLAGS_FILTER=
 if test "$GCC" = yes; then
   AC_MSG_CHECKING(for GCC 3 or later)
-  gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]]\)\..*$/\1/g'`
+  gccmajor=`echo "$gccversion" | sed -e 's/^\([[0-9]]\+\)\..*$/\1/g'`
   if test "$gccmajor" -gt "2"; then
     DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
     AC_MSG_RESULT(yes)
index af6ecdfda9cf05b9405ad55fb8327f6b596433bc..e1a2e98c1ca2fdd80b4cfef0fcfe2932e32633ae 100644 (file)
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    213,
 /**/
     212,
 /**/