patch 9.0.1787: Cannot build with latest luajit

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>

diff --git a/src/auto/configure b/src/auto/configure
index 9fd68881916d5adc5021c7156bb26d1b868c39d6..94f0b648890e37523e9c72fdfe4c49cb5c509127 100755 (executable)
--- 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 cefd0c3b31689854e401fb6b2e77a5eb75def533..6813d768576ab0e8326c646f3759d5d4690e47c9 100644 (file)
--- 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 05d6b05ea6948a35e17128ba5b331adf02bcc266..eb65fc1f291da6b64b29dab891f2fcec6c8ee6a1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1787,
 /**/
     1786,
 /**/