diff options
Diffstat (limited to 'source/d/lua')
| -rwxr-xr-x | source/d/lua/lua.SlackBuild | 8 | ||||
| -rw-r--r-- | source/d/lua/lua.usr.local.patch | 32 |
2 files changed, 37 insertions, 3 deletions
diff --git a/source/d/lua/lua.SlackBuild b/source/d/lua/lua.SlackBuild index b1be3b2c0..20aa6a035 100755 --- a/source/d/lua/lua.SlackBuild +++ b/source/d/lua/lua.SlackBuild @@ -16,7 +16,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=lua VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -69,8 +69,10 @@ tar xvf $CWD/$PKGNAM-${VERSION}.tar.?z || exit 1 cd $PKGNAM-$VERSION chown -R root:root . -# Fix up a to-be-installed header: -sed -i "s|/usr/local|/usr|" src/luaconf.h +# Also search paths under /usr/local: +cat $CWD/lua.usr.local.patch | patch -p1 --verbose || exit 1 + +# Fix luaconf.h header to use lib$LIBDIRSUFFIX: sed -i "s|lib/lua|lib$LIBDIRSUFFIX/lua|" src/luaconf.h make linux \ diff --git a/source/d/lua/lua.usr.local.patch b/source/d/lua/lua.usr.local.patch new file mode 100644 index 000000000..9383c8c47 --- /dev/null +++ b/source/d/lua/lua.usr.local.patch @@ -0,0 +1,32 @@ +--- ./src/luaconf.h.orig 2023-05-02 15:02:30.000000000 -0500 ++++ ./src/luaconf.h 2024-02-13 13:04:58.161007318 -0600 +@@ -224,19 +224,28 @@ + #else /* }{ */ + + #define LUA_ROOT "/usr/local/" ++#define LUA_ROOT2 "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" ++#define LUA_LDIR2 LUA_ROOT2 "share/lua/" LUA_VDIR "/" + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" ++#define LUA_CDIR2 LUA_ROOT2 "lib/lua/" LUA_VDIR "/" + + #if !defined(LUA_PATH_DEFAULT) + #define LUA_PATH_DEFAULT \ + LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ ++ LUA_LDIR2"?.lua;" LUA_LDIR2"?/init.lua;" \ + LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \ ++ LUA_CDIR2"?.lua;" LUA_CDIR2"?/init.lua;" \ + "./?.lua;" "./?/init.lua" + #endif + + #if !defined(LUA_CPATH_DEFAULT) + #define LUA_CPATH_DEFAULT \ +- LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so" ++ LUA_CDIR"?.so;" \ ++ LUA_CDIR2"?.so;" \ ++ LUA_CDIR"loadall.so;" \ ++ LUA_CDIR2"loadall.so;" \ ++ "./?.so" + #endif + + #endif /* } */ |