Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages / lua
Commits:
99bfa629 by Daurnimator at 2023-12-13T12:27:36+11:00
Search in both /usr/local and /usr
Fixes #1
- - - - -
3 changed files:
- PKGBUILD
- liblua.so.patch
- + paths.patch
Changes:
=====================================
PKGBUILD
=====================================
@@ -16,15 +16,18 @@ license=('MIT')
options=('!emptydirs')
source=(https://www.lua.org/ftp/lua-$pkgver.tar.gz
liblua.so.patch
+ paths.patch
lua.pc
LICENSE)
sha256sums=('7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88'
- 'a8a7f89ab0c03b4bc1d58a935c54df792ad628edb4d1788c5ac66e4fc2d9f800'
+ '644fba6f3e03c4d0c394d241149fc558da79d0114e7816c2a597097304249cb7'
+ '6bb84383498a96514d4c7deb79fd45bf484fa5e3253a1574a3311ee0bb7c24fa'
'ca9252633e782b8f85d6a94ea4f6babd4fe30bd759085b373160b1878e36ff78'
'142fb08b41a807b192b4b2c166696a1830a1c97967e5099ad0e579bf500e1da4')
prepare() {
patch -d lua-$pkgver -p1 -i ../liblua.so.patch
+ patch -d lua-$pkgver -p1 -i ../paths.patch
cp -r lua-$pkgver lua++-$pkgver
sed "s/%VER%/$_majorver/g;s/%REL%/$pkgver/g" lua.pc > lua-$pkgver/lua.pc
=====================================
liblua.so.patch
=====================================
@@ -45,16 +45,3 @@ index 514593d..372a6dc 100644
$(LUA_T): $(LUA_O) $(LUA_A)
$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-diff --git a/src/luaconf.h b/src/luaconf.h
-index bdf927e..7e15198 100644
---- a/src/luaconf.h
-+++ b/src/luaconf.h
-@@ -227,7 +227,7 @@
-
- #else /* }{ */
-
--#define LUA_ROOT "/usr/local/"
-+#define LUA_ROOT "/usr/"
- #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/"
- #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/"
-
=====================================
paths.patch
=====================================
@@ -0,0 +1,33 @@
+diff --git a/src/luaconf.h b/src/luaconf.h
+--- a/src/luaconf.h 2023-05-03 06:02:30.000000000 +1000
++++ b/src/luaconf.h 2023-12-13 12:24:30.287727037 +1100
+@@ -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 /* } */
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/lua/-/commit/99bfa629a5a00fde346420cbc62c7f82dcdd2eee
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/lua/-/commit/99bfa629a5a00fde346420cbc62c7f82dcdd2eee
You're receiving this email because of your account on gitlab.archlinux.org.
