diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-12-29 01:40:02 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-12-29 01:42:18 +0100 |
| commit | a76fbf4b725d1df81ebd593d8913781882a4e0fc (patch) | |
| tree | 426d0e5d6be186f0efc3401e06ede5fb0d34261e /main/lua5.2 | |
| parent | 961c328693591e7ee0f64b2e40cc133a8390c03b (diff) | |
| download | aports-a76fbf4b725d1df81ebd593d8913781882a4e0fc.tar.bz2 aports-a76fbf4b725d1df81ebd593d8913781882a4e0fc.tar.xz | |
main/lua5.2: add /usr/share/lua/common to LUA_PATH
Diffstat (limited to 'main/lua5.2')
| -rw-r--r-- | main/lua5.2/APKBUILD | 10 | ||||
| -rw-r--r-- | main/lua5.2/lua-5.2-module_paths.patch | 9 |
2 files changed, 8 insertions, 11 deletions
diff --git a/main/lua5.2/APKBUILD b/main/lua5.2/APKBUILD index 3998fd2ac7..3acf528eee 100644 --- a/main/lua5.2/APKBUILD +++ b/main/lua5.2/APKBUILD @@ -2,7 +2,7 @@ pkgname=lua5.2 pkgver=5.2.4 _luaver=${pkgname#lua} -pkgrel=4 +pkgrel=5 pkgdesc="Powerful light-weight programming language" url="https://www.lua.org/" arch="all" @@ -138,12 +138,6 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -md5sums="913fdb32207046b273fdb17aad70be13 lua-5.2.4.tar.gz -04df4ba7df30c617bd101aba3541c06d lua-5.2-make.patch -c34dc7623ff3c8b9ec9dab6499c841e2 lua-5.2-module_paths.patch" -sha256sums="b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b lua-5.2.4.tar.gz -eef3724469c62627722435b4cf30db4ebb1230e5512da11d9b9431a29b02955a lua-5.2-make.patch -790802a33b2200064e92abfdd0faae560a2af903ae78e5b79661f4b8e19d2bb7 lua-5.2-module_paths.patch" sha512sums="cd77148aba4b707b6c159758b5e8444e04f968092eb98f6b4c405b2fb647e709370d5a8dcf604176101d3407e196a7433b5dcdce4fe9605c76191d3649d61a8c lua-5.2.4.tar.gz f1d5e0a1db0790fae82dd6de5742631c6c4ca009752630a612d864746990a00c8f2eacc7dbf07be2bce94d04da4ad185ed10dc317d7bf093df698bf84fea682e lua-5.2-make.patch -062eb61132a60c10358590db30e8f5698ceb088b94bdcff840423c70c7bcdac4fe96c3ad35a068b795953f25712f28a4e0efd7a7bb29a0360285bf2c8bf7c416 lua-5.2-module_paths.patch" +1665c896925357c1f0404697f5f479c2928fb709b6f4464dc422027245200891ef714edf8fc1456ba3e5b0806a42ca2c40f903afa9584cd59e40f5418144c073 lua-5.2-module_paths.patch" diff --git a/main/lua5.2/lua-5.2-module_paths.patch b/main/lua5.2/lua-5.2-module_paths.patch index 3d0b3c21b6..58237b6fae 100644 --- a/main/lua5.2/lua-5.2-module_paths.patch +++ b/main/lua5.2/lua-5.2-module_paths.patch @@ -2,21 +2,24 @@ diff --git a/src/luaconf.h b/src/luaconf.h index df802c9..f8f64e0 100644 --- a/src/luaconf.h +++ b/src/luaconf.h -@@ -101,13 +101,19 @@ +@@ -101,13 +99,22 @@ #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" #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_LDIR3 LUA_ROOT2 "share/common/" #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR +#define LUA_CDIR2 LUA_ROOT2 "lib/lua/" LUA_VDIR #define LUA_PATH_DEFAULT \ LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ - LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" "./?.lua" ++ LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \ + LUA_LDIR2"?.lua;" LUA_LDIR2"?/init.lua;" \ -+ LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" "./?.lua;" \ -+ LUA_CDIR2"?.lua;" LUA_CDIR2"?/init.lua;" "./?.lua" ++ LUA_CDIR2"?.lua;" LUA_CDIR2"?/init.lua;" \ ++ LUA_LDIR3"?.lua;" LUA_LDIR3"?/init.lua;" \ ++ "./?.lua" #define LUA_CPATH_DEFAULT \ - LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so" + LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" \ |