patch 9.0.1787: Cannot build with latest luajit
Commit:
https://github.com/vim/vim/commit/d42f95bbfb5abcc78a0cc99f326691f328a2f33e
Author: Christian Brabandt <[email protected]>
Date: Thu Aug 24 08:15:38 2023 +0200
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 <[email protected]>
diff --git a/src/auto/configure b/src/auto/configure
index 9fd688819..94f0b6488 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]*\)* .*/ /'`
+ vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT
\([0-9.]*\)\.[0-9]\(-\?[a-z0-9]*\)* .*/ /'`
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 cefd0c3b3..6813d7685 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]]*\)* .*/ /'` ])
+ [ vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT
\([[0-9.]]*\)\.[[0-9]]\(-\?[[a-z0-9]]*\)* .*/ /'` ])
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 05d6b05ea..eb65fc1f2 100644
--- 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,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1qZ3r1-00FzId-M8%40256bit.org.
