Mercurial > vim
changeset 32985:d37f43ba2120 v9.0.1787
patch 9.0.1787: Cannot build with latest luajit
Commit: https://github.com/vim/vim/commit/d42f95bbfb5abcc78a0cc99f326691f328a2f33e
Author: Christian Brabandt <cb@256bit.org>
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 <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 24 Aug 2023 08:30:03 +0200 |
| parents | 75c283beb74f |
| children | 0600214b87af |
| files | src/auto/configure src/configure.ac src/version.c |
| diffstat | 3 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -5435,7 +5435,7 @@ fi 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; }
--- a/src/configure.ac +++ b/src/configure.ac @@ -638,7 +638,7 @@ if test "$enable_luainterp" = "yes" -o " 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"