diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-12-29 01:18:19 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-12-29 01:42:18 +0100 |
| commit | 86cdf1f59c4b111a76f379f84c2edd320a1705dc (patch) | |
| tree | 16770a46574b7d030424c49e0dd57df6450c1c24 /main | |
| parent | 7c65de4a63c4fb1193f961ded753831595412ae7 (diff) | |
| download | aports-86cdf1f59c4b111a76f379f84c2edd320a1705dc.tar.bz2 aports-86cdf1f59c4b111a76f379f84c2edd320a1705dc.tar.xz | |
main/luajit: add /usr/share/common to LUA_PATH
Diffstat (limited to 'main')
| -rw-r--r-- | main/luajit/APKBUILD | 8 | ||||
| -rw-r--r-- | main/luajit/module-paths.patch | 25 |
2 files changed, 30 insertions, 3 deletions
diff --git a/main/luajit/APKBUILD b/main/luajit/APKBUILD index 34ea3b3c7c..35cc7b76e4 100644 --- a/main/luajit/APKBUILD +++ b/main/luajit/APKBUILD @@ -4,7 +4,7 @@ pkgname=luajit _pkgname=LuaJIT pkgver=2.1.0_beta3 _pkgver=${pkgver/_/-} -pkgrel=1 +pkgrel=2 pkgdesc='Just-in-time compiler and replacement for Lua 5.1' url='http://luajit.org' arch="all !s390x" @@ -12,7 +12,8 @@ license="MIT" makedepends="$depends_dev paxmark" subpackages="$pkgname-dev $pkgname-doc" source="http://luajit.org/download/$_pkgname-$_pkgver.tar.gz - enable-support-for-ppc64le.patch" + enable-support-for-ppc64le.patch + module-paths.patch" builddir="$srcdir/$_pkgname-$_pkgver" build() { @@ -44,4 +45,5 @@ package() { } sha512sums="c44e967a0f671ed32b55aee810bc8b3b63737a2d7363b8984ae1949b24f98dbb3f9be7c1e10239fdeb96a3e3c836f606342cbd61838cf9bcadb077443eb5bc12 LuaJIT-2.1.0-beta3.tar.gz -c2b1a39fe19dfe1817811015ef1fea24b0966ff791fcbde1090527331c2b9ceab9b923960c01cfb8aa81bab40aa437eb0f285385378e7eaa83016abf36beae27 enable-support-for-ppc64le.patch" +c2b1a39fe19dfe1817811015ef1fea24b0966ff791fcbde1090527331c2b9ceab9b923960c01cfb8aa81bab40aa437eb0f285385378e7eaa83016abf36beae27 enable-support-for-ppc64le.patch +2031b854a75e2a262fb68b75877861ce448de44f2857a6f0879d5d3580aa076e16edc7d7ba81fd4708d9b2d7f9eb80ee11847808e47c87fe2cb579c31cded3ce module-paths.patch" diff --git a/main/luajit/module-paths.patch b/main/luajit/module-paths.patch new file mode 100644 index 0000000000..27e73675a1 --- /dev/null +++ b/main/luajit/module-paths.patch @@ -0,0 +1,25 @@ +Add /usr/share/common to LUA_PATH. We use this directory for Lua modules +that are compatible with Lua 5.1 and newer. + +--- a/src/luaconf.h ++++ b/src/luaconf.h +@@ -42,8 +42,10 @@ + #ifdef LUA_ROOT + #define LUA_JROOT LUA_ROOT + #define LUA_RLDIR LUA_ROOT "/share" LUA_LUADIR ++#define LUA_RLDIR2 LUA_ROOT "/share/common/" + #define LUA_RCDIR LUA_ROOT "/" LUA_MULTILIB LUA_LUADIR + #define LUA_RLPATH ";" LUA_RLDIR "?.lua;" LUA_RLDIR "?/init.lua" ++#define LUA_RLPATH2 ";" LUA_RLDIR2 "?.lua;" LUA_RLDIR2 "?/init.lua" + #define LUA_RCPATH ";" LUA_RCDIR "?.so" + #else + #define LUA_JROOT LUA_LROOT +@@ -58,7 +60,7 @@ + #define LUA_LCPATH1 ";" LUA_LCDIR "?.so" + #define LUA_LCPATH2 ";" LUA_LCDIR "loadall.so" + +-#define LUA_PATH_DEFAULT "./?.lua" LUA_JPATH LUA_LLPATH LUA_RLPATH ++#define LUA_PATH_DEFAULT "./?.lua" LUA_JPATH LUA_LLPATH LUA_RLPATH LUA_RLPATH2 + #define LUA_CPATH_DEFAULT "./?.so" LUA_LCPATH1 LUA_RCPATH LUA_LCPATH2 + #endif + |