mirror of
https://git.freebsd.org/ports.git
synced 2025-07-01 01:20:31 -04:00
9bf68f57dd
Previously, we patched in the names of all the python binary versions, but I have been doing a terrible job of keeping them up-to-date. Instead, just tell vim's configure script the path to the binary we're using. This will fix building against python 3.7. PR: 230675 Reported by: Kamigishi Rei MFH: 2018Q3
48 lines
1.9 KiB
Text
48 lines
1.9 KiB
Text
--- src/auto/configure.orig 2018-04-21 15:08:14 UTC
|
|
+++ src/auto/configure
|
|
@@ -903,7 +903,7 @@ pdfdir='${docdir}'
|
|
psdir='${docdir}'
|
|
libdir='${exec_prefix}/lib'
|
|
localedir='${datarootdir}/locale'
|
|
-mandir='${datarootdir}/man'
|
|
+mandir='${prefix}/man'
|
|
|
|
ac_prev=
|
|
ac_dashdash=
|
|
@@ -5369,7 +5369,7 @@ $as_echo_n "checking Lua version of LuaJ
|
|
if ${vi_cv_version_lua_luajit+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
- vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'`
|
|
+ vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //' | tr -d '/'`
|
|
fi
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua_luajit" >&5
|
|
$as_echo "$vi_cv_version_lua_luajit" >&6; }
|
|
@@ -5423,7 +5423,7 @@ $as_echo_n "checking Lua version... " >&
|
|
if ${vi_cv_version_plain_lua+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
- vi_cv_version_plain_lua=`${vi_cv_path_plain_lua} -e "print(_VERSION)" | sed 's/.* //'`
|
|
+ vi_cv_version_plain_lua=`${vi_cv_path_plain_lua} -e "print(_VERSION)" | sed 's/.* //' | tr -d '.'`
|
|
fi
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_plain_lua" >&5
|
|
$as_echo "$vi_cv_version_plain_lua" >&6; }
|
|
@@ -5514,7 +5514,7 @@ rm -f core conftest.err conftest.$ac_obj
|
|
LIBS=$libs_save
|
|
fi
|
|
if test "x$lua_ok" = "xyes"; then
|
|
- LUA_CFLAGS="-I${vi_cv_path_lua_pfx}/include${LUA_INC}"
|
|
+ LUA_CFLAGS="-I${LUA_INCDIR}"
|
|
LUA_SRC="if_lua.c"
|
|
LUA_OBJ="objects/if_lua.o"
|
|
LUA_PRO="if_lua.pro"
|
|
@@ -5571,7 +5571,8 @@ $as_echo "yes" >&6; }
|
|
$as_echo "#define DYNAMIC_LUA 1" >>confdefs.h
|
|
|
|
LUA_LIBS=""
|
|
- LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS"
|
|
+ vi_cv_version_lua=${LUA_VER}
|
|
+ LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua-${vi_cv_dll_name_lua}.so\\\" $LUA_CFLAGS"
|
|
fi
|
|
if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \
|
|
test "x$MACOS_X" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \
|