diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-02-07 20:50:07 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-02-07 20:50:07 +0100 |
| commit | 348808f7c000a49d435c15db68c814b026f8167d (patch) | |
| tree | 302062ef2ccc2f33f9d62ab337614724cdb8aa7f | |
| parent | c2a4b35b86fa8b28a34a9aea8ad16c87dbc6d834 (diff) | |
| download | vim-git-8.2.0228.tar.gz | |
patch 8.2.0228: configure does not recognize gcc version on BSDv8.2.0228
Problem: Configure does not recognize gcc version on BSD.
Solution: Do not use "\+" in the pattern matching the version number. (Ozaki
Kiichi, closes #5590)
| -rwxr-xr-x | src/auto/configure | 2 | ||||
| -rw-r--r-- | src/configure.ac | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure index 59f3e68d6..ff2739c86 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -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/^\([0-9]\+\)\..*$/\1/g'` + gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9][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 diff --git a/src/configure.ac b/src/configure.ac index bf10eac55..fe2022802 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -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/^\([[0-9]]\+\)\..*$/\1/g'` + gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]][[0-9]]*\)\..*$/\1/g'` if test "$gccmajor" -gt "2"; then DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'" AC_MSG_RESULT(yes) diff --git a/src/version.c b/src/version.c index 82f1003be..29c161478 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 228, +/**/ 227, /**/ 226, |