thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.0213: configure does not recognize gcc 10.0 and later

Browse Source 
Problem:    Configure does not recognize gcc 10.0 and later.
Solution:   Adjust the pattern matching the version number. (Sergei
            Trofimovich, closes #5580)
This commit is contained in:
Bram Moolenaar
2020-02-05 20:44:24 +01:00
parent 07ada5ff2f
commit 7077892a79
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/auto/configure vendored
View File

@@ -14762,7 +14762,7 @@ DEPEND_CFLAGS_FILTER=
if test "$GCC" = yes; then if test "$GCC" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC 3 or later" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC 3 or later" >&5
$as_echo_n "checking for GCC 3 or later... " >&6; } $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 if test "$gccmajor" -gt "2"; then
DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'" DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

4
src/configure.ac
View File

@@ -2195,7 +2195,7 @@ else
fi fi
dnl On my HPUX system the X include dir is found, but the lib dir not. 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 if test -d "$x_includes" && test ! -d "$x_libraries"; then
x_libraries=`echo "$x_includes" | sed s/include/lib/` x_libraries=`echo "$x_includes" | sed s/include/lib/`
@@ -4447,7 +4447,7 @@ dnl the number before the version number.
DEPEND_CFLAGS_FILTER= DEPEND_CFLAGS_FILTER=
if test "$GCC" = yes; then if test "$GCC" = yes; then
AC_MSG_CHECKING(for GCC 3 or later) 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 if test "$gccmajor" -gt "2"; then
DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'" DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)

2
src/version.c
View File

@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
213,
/**/ /**/
212, 212,
/**/ /**/