aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-09-20 13:54:20 +0000
committerTimo Teräs <timo.teras@iki.fi>2013-09-20 13:54:20 +0000
commit3a7ce65edc5837db91835bcddb371802a8d65904 (patch)
treebcd1efe5ff04ffc124e82566886525726bcfe984
parent37c71417836476d5ec33db9b228112a83e1a60e8 (diff)
main/lua-posix: fix build against musl
- fix non-standard regular expressions - regenerate autotools
-rw-r--r--main/lua-posix/APKBUILD15
-rw-r--r--main/lua-posix/lua-version.patch33
2 files changed, 43 insertions, 5 deletions
diff --git a/main/lua-posix/APKBUILD b/main/lua-posix/APKBUILD
index 5385d5a5b4f..e8ef999d82e 100644
--- a/main/lua-posix/APKBUILD
+++ b/main/lua-posix/APKBUILD
@@ -8,9 +8,10 @@ url="https://github.com/luaposix/luaposix"
arch="all"
license="MIT"
depends="lua lua-bitlib"
-makedepends="lua lua-dev perl ncurses-dev"
+makedepends="lua lua-dev perl ncurses-dev autoconf automake"
source="luaposix-$pkgver.tar.gz::https://github.com/luaposix/luaposix/archive/release-v$pkgver.tar.gz
- 0001-Removed-Lua-5.2-functions-lua_len-and-lua_tointegerx.patch"
+ 0001-Removed-Lua-5.2-functions-lua_len-and-lua_tointegerx.patch
+ lua-version.patch"
replaces="luaposix"
subpackages="lua-curses $pkgname-doc"
@@ -26,6 +27,7 @@ prepare() {
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
+ aclocal && autoconf && automake --add-missing || return 1
}
build() {
cd "$_builddir"
@@ -53,8 +55,11 @@ curses() {
mv "$pkgdir"/$_luashare/curses* "$subpkgdir"/$_luashare/ || return 1
}
md5sums="26018f1e581e24d2875e848a77d03139 luaposix-5.1.26.tar.gz
-2af13134ae7e936e74f6f1f2f011a3ba 0001-Removed-Lua-5.2-functions-lua_len-and-lua_tointegerx.patch"
+2af13134ae7e936e74f6f1f2f011a3ba 0001-Removed-Lua-5.2-functions-lua_len-and-lua_tointegerx.patch
+6e725977a081eee3a7b555028c134372 lua-version.patch"
sha256sums="8de25b0013cc97ccf5ccd8b23012a548fb8ed682d8d95c849c3798bdfbda9866 luaposix-5.1.26.tar.gz
-256504f015850b3126a53d40d6210b8d6f473bc3c180b74621c62709d3db594d 0001-Removed-Lua-5.2-functions-lua_len-and-lua_tointegerx.patch"
+256504f015850b3126a53d40d6210b8d6f473bc3c180b74621c62709d3db594d 0001-Removed-Lua-5.2-functions-lua_len-and-lua_tointegerx.patch
+63d1b73a37c99c8aa53c64b2f2ea00e922aadbf465b231aa73d77afceb76bf2b lua-version.patch"
sha512sums="48e8a7ab8752d0a87326226813c1feb4f76596c568eb657777c8861837fd036835107c1ef7125d9512d42326ce560249057a791e99c36e29228fae665443fb59 luaposix-5.1.26.tar.gz
-b460d42e39c790ca4dd44b16923a9a44267a2b2088995eed9cdbfc9b852d9beb30f96a30cceddd6bbe32e2ed2cc806515e8d9e9fb7a3d877043a65f1f1f2394e 0001-Removed-Lua-5.2-functions-lua_len-and-lua_tointegerx.patch"
+b460d42e39c790ca4dd44b16923a9a44267a2b2088995eed9cdbfc9b852d9beb30f96a30cceddd6bbe32e2ed2cc806515e8d9e9fb7a3d877043a65f1f1f2394e 0001-Removed-Lua-5.2-functions-lua_len-and-lua_tointegerx.patch
+bffef1c144a43b59b25e07d7def7a7f65ebd8ec1f48ed3692097470af4e6f01ff1a2385624685da697ebfe6a0082783d080bbfa7156f38e529315d91b6870ac8 lua-version.patch"
diff --git a/main/lua-posix/lua-version.patch b/main/lua-posix/lua-version.patch
new file mode 100644
index 00000000000..e975c6e66e9
--- /dev/null
+++ b/main/lua-posix/lua-version.patch
@@ -0,0 +1,33 @@
+--- ./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 @@
+ ],
+ [ 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@:>@+"`
+ ],
+ [ax_cv_lua_header_version='unknown'])
+ CPPFLAGS=$_ax_lua_saved_cppflags
+