diff options
author | Christian Brabandt <cb@256bit.org> | 2023-08-24 08:15:38 +0200 |
---|---|---|
committer | Christian Brabandt <cb@256bit.org> | 2023-08-24 08:15:38 +0200 |
commit | d42f95bbfb5abcc78a0cc99f326691f328a2f33e (patch) | |
tree | 1d4d1c8b4f6e53187deca55fb1cf4607c737f171 | |
parent | 2f25e40b1f545f4aa38377f0c25effb112b5d1ef (diff) |
patch 9.0.1787: Cannot build with latest luajitv9.0.1787
Problem: Cannot build with latest luajit
Solution: adjust sed regexp and don't expect '-' in version output
closes: #12896
Signed-off-by: Christian Brabandt <cb@256bit.org>
-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 9fd6888191..94f0b64889 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -5435,7 +5435,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 cefd0c3b31..6813d76857 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 05d6b05ea6..eb65fc1f29 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 */ /**/ + 1787, +/**/ 1786, /**/ 1785, |