Skip to content

Instantly share code, notes, and snippets.

@sablime

sablime/if_luajit.patch

Created May 11, 2013 00:29
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save sablime/5558413 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save sablime/5558413 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
if_luajit.patch
diff -r c9dbfdcc0c0a src/auto/configure
--- a/src/auto/configure Fri May 10 12:51:25 2013 +0900
+++ b/src/auto/configure Fri May 10 15:02:06 2013 +0900
@@ -4648,8 +4648,8 @@
LUA_INC=
if test "X$vi_cv_path_lua_pfx" != "X"; then
- # Extract the first word of "lua", so it can be a program name with args.
-set dummy lua; ac_word=$2
+ # Extract the first word of "luajit", so it can be a program name with args.
+set dummy luajit; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_vi_cv_path_lua+set}" = set; then :
@@ -4689,6 +4689,58 @@
if test "X$vi_cv_path_lua" != "X"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking LuaJIT version" >&5
+$as_echo_n "checking LuaJIT version... " >&6; }
+if test "${vi_cv_version_luajit+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ vi_cv_version_luajit=`${vi_cv_path_lua} -v | sed 's/LuaJIT \([0-9.]\+\)\.[0-9] .*/\1/'`
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_luajit" >&5
+$as_echo "$vi_cv_version_luajit" >&6; }
+ else
+ # Extract the first word of "lua", so it can be a program name with args.
+set dummy lua; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_vi_cv_path_lua+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $vi_cv_path_lua in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_vi_cv_path_lua="$vi_cv_path_lua" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_vi_cv_path_lua="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+vi_cv_path_lua=$ac_cv_path_vi_cv_path_lua
+if test -n "$vi_cv_path_lua"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_lua" >&5
+$as_echo "$vi_cv_path_lua" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ fi
+ if test "X$vi_cv_path_lua" != "X"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Lua version" >&5
$as_echo_n "checking Lua version... " >&6; }
if test "${vi_cv_version_lua+set}" = set; then :
@@ -4699,33 +4751,54 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua" >&5
$as_echo "$vi_cv_version_lua" >&6; }
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include" >&5
-$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include... " >&6; }
- if test -f $vi_cv_path_lua_pfx/include/lua.h; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua" >&5
-$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua... " >&6; }
- if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then
+ if test "X$vi_cv_version_luajit" != "X"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit" >&5
+$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit... " >&6; }
+ if test -f $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit/lua.h; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- LUA_INC=/lua$vi_cv_version_lua
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- vi_cv_path_lua_pfx=
+ LUA_INC=/luajit-$vi_cv_version_luajit
fi
fi
+ if test "X$LUA_INC" = "X"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include" >&5
+$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include... " >&6; }
+ if test -f $vi_cv_path_lua_pfx/include/lua.h; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua" >&5
+$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua... " >&6; }
+ if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ LUA_INC=/lua$vi_cv_version_lua
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ vi_cv_path_lua_pfx=
+ fi
+ fi
+ fi
fi
if test "X$vi_cv_path_lua_pfx" != "X"; then
- if test "X$LUA_INC" != "X"; then
- LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua$vi_cv_version_lua"
+ if test "X$vi_cv_version_luajit" != "X"; then
+ multiarch=`dpkg-architecture -qDEB_HOST_MULTIARCH 2> /dev/null`
+ if test "X$multiarch" != "X"; then
+ lib_multiarch="lib/${multiarch}"
+ else
+ lib_multiarch="lib"
+ fi
+ LUA_LIBS="-L${vi_cv_path_lua_pfx}/${lib_multiarch} -lluajit-$vi_cv_version_lua"
else
- LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua"
+ if test "X$LUA_INC" != "X"; then
+ LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua$vi_cv_version_lua"
+ else
+ LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua"
+ fi
fi
LUA_CFLAGS="-I${vi_cv_path_lua_pfx}/include${LUA_INC}"
LUA_SRC="if_lua.c"
@@ -4734,6 +4807,9 @@
$as_echo "#define FEAT_LUA 1" >>confdefs.h
if test "$enable_luainterp" = "dynamic"; then
+ if test "X$vi_cv_version_luajit" != "X"; then
+ luajit="jit"
+ fi
if test -f "${vi_cv_path_lua_pfx}/bin/cyglua-${vi_cv_version_lua}.dll"; then
vi_cv_dll_name_lua="cyglua-${vi_cv_version_lua}.dll"
else
@@ -4747,14 +4823,14 @@
fi
for sover in "${vi_cv_version_lua}.so" "-${vi_cv_version_lua}.so" ".so.${vi_cv_version_lua}"; do
for i in .0 .1 .2 .3 .4 .5 .6 .7 .8 .9 ""; do
- if test -f "${vi_cv_path_lua_pfx}/${subdir}/liblua${sover}$i"; then
+ if test -f "${vi_cv_path_lua_pfx}/${subdir}/liblua${luajit}${sover}$i"; then
sover2="$i"
break 3
fi
done
done
done
- vi_cv_dll_name_lua="liblua${sover}$sover2"
+ vi_cv_dll_name_lua="liblua${luajit}${sover}$sover2"
fi
$as_echo "#define DYNAMIC_LUA 1" >>confdefs.h
diff -r c9dbfdcc0c0a src/configure.in
--- a/src/configure.in Fri May 10 12:51:25 2013 +0900
+++ b/src/configure.in Fri May 10 15:02:06 2013 +0900
@@ -455,35 +455,62 @@
LUA_INC=
if test "X$vi_cv_path_lua_pfx" != "X"; then
- dnl -- try to find Lua executable
- AC_PATH_PROG(vi_cv_path_lua, lua)
+ dnl -- try to find LuaJIT executable
+ AC_PATH_PROG(vi_cv_path_lua, luajit)
+ if test "X$vi_cv_path_lua" != "X"; then
+ dnl -- find LuaJIT version
+ AC_CACHE_CHECK(LuaJIT version, vi_cv_version_luajit,
+ [ vi_cv_version_luajit=`${vi_cv_path_lua} -v | sed 's/LuaJIT \([[0-9.]]\+\)\.[[0-9]] .*/\1/'` ])
+ else
+ dnl -- try to find Lua executable
+ AC_PATH_PROG(vi_cv_path_lua, lua)
+ fi
if test "X$vi_cv_path_lua" != "X"; then
dnl -- find Lua version
AC_CACHE_CHECK(Lua version, vi_cv_version_lua,
[ vi_cv_version_lua=`${vi_cv_path_lua} -e "print(_VERSION)" | sed 's/.* //'` ])
fi
- AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include)
- if test -f $vi_cv_path_lua_pfx/include/lua.h; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua)
- if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then
+ if test "X$vi_cv_version_luajit" != "X"; then
+ AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit)
+ if test -f $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit/lua.h; then
AC_MSG_RESULT(yes)
- LUA_INC=/lua$vi_cv_version_lua
+ LUA_INC=/luajit-$vi_cv_version_luajit
+ fi
+ fi
+ if test "X$LUA_INC" = "X"; then
+ AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include)
+ if test -f $vi_cv_path_lua_pfx/include/lua.h; then
+ AC_MSG_RESULT(yes)
else
- AC_MSG_RESULT(no)
- vi_cv_path_lua_pfx=
+ AC_MSG_RESULT(no)
+ AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua)
+ if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then
+ AC_MSG_RESULT(yes)
+ LUA_INC=/lua$vi_cv_version_lua
+ else
+ AC_MSG_RESULT(no)
+ vi_cv_path_lua_pfx=
+ fi
fi
fi
fi
if test "X$vi_cv_path_lua_pfx" != "X"; then
- if test "X$LUA_INC" != "X"; then
- dnl Test alternate location using version
- LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua$vi_cv_version_lua"
+ if test "X$vi_cv_version_luajit" != "X"; then
+ multiarch=`dpkg-architecture -qDEB_HOST_MULTIARCH 2> /dev/null`
+ if test "X$multiarch" != "X"; then
+ lib_multiarch="lib/${multiarch}"
+ else
+ lib_multiarch="lib"
+ fi
+ LUA_LIBS="-L${vi_cv_path_lua_pfx}/${lib_multiarch} -lluajit-$vi_cv_version_lua"
else
- LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua"
+ if test "X$LUA_INC" != "X"; then
+ dnl Test alternate location using version
+ LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua$vi_cv_version_lua"
+ else
+ LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua"
+ fi
fi
LUA_CFLAGS="-I${vi_cv_path_lua_pfx}/include${LUA_INC}"
LUA_SRC="if_lua.c"
@@ -491,6 +518,9 @@
LUA_PRO="if_lua.pro"
AC_DEFINE(FEAT_LUA)
if test "$enable_luainterp" = "dynamic"; then
+ if test "X$vi_cv_version_luajit" != "X"; then
+ luajit="jit"
+ fi
if test -f "${vi_cv_path_lua_pfx}/bin/cyglua-${vi_cv_version_lua}.dll"; then
vi_cv_dll_name_lua="cyglua-${vi_cv_version_lua}.dll"
else
@@ -506,14 +536,14 @@
fi
for sover in "${vi_cv_version_lua}.so" "-${vi_cv_version_lua}.so" ".so.${vi_cv_version_lua}"; do
for i in .0 .1 .2 .3 .4 .5 .6 .7 .8 .9 ""; do
- if test -f "${vi_cv_path_lua_pfx}/${subdir}/liblua${sover}$i"; then
+ if test -f "${vi_cv_path_lua_pfx}/${subdir}/liblua${luajit}${sover}$i"; then
sover2="$i"
break 3
fi
done
done
done
- vi_cv_dll_name_lua="liblua${sover}$sover2"
+ vi_cv_dll_name_lua="liblua${luajit}${sover}$sover2"
fi
AC_DEFINE(DYNAMIC_LUA)
LUA_LIBS=""
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment