diff options
| author | ichizok <gclient.gaap@gmail.com> | 2023-08-29 20:54:32 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-08-29 20:54:32 +0200 |
| commit | bddc6adca647f7f20ff6e1b7913e394d09c5eb23 (patch) | |
| tree | f70c92dd5239c466e3255d036e36b9169286cc15 /src | |
| parent | a5eb6785efcc36a97e071722408acc20d6c6e606 (diff) | |
patch 9.0.1816: configure: sed uses non-portable regexv9.0.1816
Problem: configure: sed uses non-portable regex
Solution: use '*' modifier instead of '\?' in regex
for luajit version detection
closes: #12954
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: ichizok <gclient.gaap@gmail.com>
Diffstat (limited to 'src')
| -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 b3985d59db..7f326c429c 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -5385,7 +5385,7 @@ $as_echo_n "checking LuaJIT version... " >&6; } if ${vi_cv_version_luajit+:} false; then : $as_echo_n "(cached) " >&6 else - vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([0-9.]*\)\.[0-9]\(-\?[a-z0-9]*\)* .*/\1/'` + vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([0-9.]*\)\.[0-9]\(-*[a-z0-9]*\)* .*/\1/'` fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_luajit" >&5 $as_echo "$vi_cv_version_luajit" >&6; } diff --git a/src/configure.ac b/src/configure.ac index 6a847222cc..c7e01f0b80 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -638,7 +638,7 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then if test "X$vi_cv_path_luajit" != "X"; then dnl -- find LuaJIT version AC_CACHE_CHECK(LuaJIT version, vi_cv_version_luajit, - [ vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([[0-9.]]*\)\.[[0-9]]\(-\?[[a-z0-9]]*\)* .*/\1/'` ]) + [ vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([[0-9.]]*\)\.[[0-9]]\(-*[[a-z0-9]]*\)* .*/\1/'` ]) AC_CACHE_CHECK(Lua version of LuaJIT, vi_cv_version_lua_luajit, [ vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'` ]) vi_cv_path_lua="$vi_cv_path_luajit" diff --git a/src/version.c b/src/version.c index 6d818ada90..8a755f07eb 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1816, +/**/ 1815, /**/ 1814, |