diff options
Diffstat (limited to 'main/lua-posix')
| -rw-r--r-- | main/lua-posix/APKBUILD | 19 | ||||
| -rw-r--r-- | main/lua-posix/lua-version.patch | 26 |
2 files changed, 12 insertions, 33 deletions
diff --git a/main/lua-posix/APKBUILD b/main/lua-posix/APKBUILD index 3589247265..2d6b2dfed4 100644 --- a/main/lua-posix/APKBUILD +++ b/main/lua-posix/APKBUILD @@ -4,8 +4,8 @@ _luaversions="5.1 5.2" pkgname=lua-posix _name=luaposix -pkgver=31 -pkgrel=1 +pkgver=32 +pkgrel=0 pkgdesc="POSIX library for Lua $_luaver" url="https://github.com/luaposix/luaposix" arch="all" @@ -56,7 +56,8 @@ build() { package() { for _i in $_luaversions; do cd "$srcdir"/build-$_i - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" luadir="/usr/share/lua/$_i" install \ + || return 1 done rm "$pkgdir"/usr/lib/lua/*/*.la || return 1 } @@ -95,9 +96,9 @@ for _i in $_luaversions; do eval "_posix_${_i/./_}() { _split_posix $_i; }" done -md5sums="a25ff76d54bbbebf7a1f3b20c9806ee3 luaposix-31.tar.gz -30da8a857ac8026b6cf6932decdccc61 lua-version.patch" -sha256sums="c5ed2f6c16b9f31d3ca0db05f9b660db69c966baab244878480ab6658abbbe24 luaposix-31.tar.gz -68a3e67e61b853927a4113a3603d528afe97999fae3bc37b9669e1045ddce299 lua-version.patch" -sha512sums="263d0ffdb4043199a37bccc2f74419e72d6d812f74104fae6bd979a13217ab58275c6d6e21a0aaa4232851fa29941eececa22bc441fb37bebbdc2842b1c37c3f luaposix-31.tar.gz -7cde55168dd183ea9a922c2ddfee78a0d43dcc5fa313725c1718693d327fcdc682bb692b4d3a9968322ce53f1dba42990a5b7b150a6d892fcc3f887538a4dea5 lua-version.patch" +md5sums="2bfede7b7cee96c5d0f6c0354e17498c luaposix-32.tar.gz +ee005f27a774ac78e877a9484ec46cb3 lua-version.patch" +sha256sums="09dbbde825fd9b76a8a1f6a80920434f8629a392cd1840021ed4b95b21fcf073 luaposix-32.tar.gz +7a9470ff830a563f8a51b434fee637ba03fefd6405a4960ee9023713f75f457e lua-version.patch" +sha512sums="cd0cb4a0c8eb291e11526fd1a110ed41a92ae05a656c1e5fca9fd296a5f766c04390ad9399ae2eb5d6d8f28cad1c099ffae01e8d8ea94e1e8ce4f639dc822957 luaposix-32.tar.gz +fcbd081c46910ff15ba66c76ce3d130224aa363c3e1265158f77fa244c7e16156970703ab4e57d70cb1cd4f2b2228043a2f5e1affad6bf601e0ee8ca81e2504a lua-version.patch" diff --git a/main/lua-posix/lua-version.patch b/main/lua-posix/lua-version.patch index bdd1ea0bc6..df385ccd98 100644 --- a/main/lua-posix/lua-version.patch +++ b/main/lua-posix/lua-version.patch @@ -1,33 +1,11 @@ --- ./m4/ax_lua.m4.orig +++ ./m4/ax_lua.m4 -@@ -257,9 +257,7 @@ - ], - [ dnl Query Lua for its version number. - AC_CACHE_CHECK([for $ax_display_LUA version], [ax_cv_lua_version], -- [ ax_cv_lua_version=`$LUA -e "print(_VERSION)" | \ -- sed "s|^Lua \(.*\)|\1|" | \ -- grep -o "^@<:@0-9@:>@\+\\.@<:@0-9@:>@\+"` -+ [ ax_cv_lua_version=`$LUA -e 'print(_VERSION:match("^Lua (%d+%.%d+)$"))'` - ]) - AS_IF([test "x$ax_cv_lua_version" = 'x'], - [AC_MSG_ERROR([invalid Lua version number])]) -@@ -363,8 +361,7 @@ - dnl ========================================================================= - AC_DEFUN([_AX_LUA_CHK_VER], - [ -- _ax_test_ver=`$1 -e "print(_VERSION)" 2>/dev/null | \ -- sed "s|^Lua \(.*\)|\1|" | grep -o "^@<:@0-9@:>@\+\\.@<:@0-9@:>@\+"` -+ _ax_test_ver=`$1 -e 'print(_VERSION:match("^Lua (%d+%.%d+)$"))' 2>/dev/null` - AS_IF([test "x$_ax_test_ver" = 'x'], - [_ax_test_ver='0']) - AX_COMPARE_VERSION([$_ax_test_ver], [ge], [$2]) -@@ -487,7 +487,7 @@ +@@ -481,7 +481,7 @@ ], [ ax_cv_lua_header_version=`./conftest$EXEEXT p | \ sed "s|^Lua \(.*\)|\1|" | \ - grep -o "^@<:@0-9@:>@\+\\.@<:@0-9@:>@\+"` -+ grep -E -o "^@<:@0-9@:>@+\.@<:@0-9@:>@+"` ++ grep -E -o "^@<:@0-9@:>@+\\.@<:@0-9@:>@+"` ], [ax_cv_lua_header_version='unknown']) CPPFLAGS=$_ax_lua_saved_cppflags - |