testing/lua-mpack: fix multiple issues, add subpkg lua5.3-mpack

1 files changed, 35 insertions, 26 deletions

diff --git a/testing/lua-mpack/APKBUILD b/testing/lua-mpack/APKBUILD
index 10ee63fbee..3739e61fbf 100644
--- a/testing/lua-mpack/APKBUILD
+++ b/testing/lua-mpack/APKBUILD
@@ -1,50 +1,59 @@
 # Contributor: Daniel Sabogal <dsabogalcc@gmail.com>
 # Maintainer:
 pkgname=lua-mpack
+_pkgname=libmpack
 pkgver=1.0.3
-_lua_versions="5.1 5.2"
 pkgrel=0
-_pkgdesc="Libmpack bindings for Lua"
-pkgdesc="$_pkgdesc"
+pkgdesc="Libmpack bindings for Lua"
 url="https://github.com/tarruda/libmpack"
-arch="all"
+arch="noarch"
 license="MIT"
 depends=""
-depends_dev=""
 makedepends=""
-install=""
 subpackages=""
-source="libmpack-$pkgver.tar.gz::https://github.com/tarruda/libmpack/archive/$pkgver.tar.gz"
-for _v in $_lua_versions; do
-        makedepends="$makedepends lua$_v-dev"
-        subpackages="$subpackages lua$_v-mpack:split_${_v/./_}"
+source="$_pkgname-$pkgver.tar.gz::https://github.com/tarruda/$_pkgname/archive/$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-$pkgver"
+
+_luaversions="5.1 5.2 5.3"
+for _v in $_luaversions; do
+	makedepends="$makedepends lua$_v-dev"
+	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage:all"
 done
 
-builddir="$srcdir"/libmpack-$pkgver
+prepare() {
+	default_prepare || return 1
+
+	local lver; for lver in $_luaversions; do
+		cp -r "$builddir" "$builddir-$lver" || return 1
+	done
+}
 
 build() {
-	cd "$builddir"
-	gcc $CFLAGS -fPIC -c binding/lua/lmpack.c -o lmpack.o || return 1
-	gcc -shared -o mpack.so lmpack.o || return 1
+	local lver; for lver in $_luaversions; do
+		msg "Building for Lua $lver..."
+		make -C "$builddir-$lver"/binding/lua \
+			CFLAGS="$CFLAGS" \
+			USE_SYSTEM_LUA=yes \
+			LUA_INCLUDE="$(pkg-config --cflags lua$lver)" \
+			LUA_LIB="$(pkg-config --libs lua$lver)" || return 1
+	done
 }
 
 package() {
-	arch="noarch"
 	mkdir -p "$pkgdir"
 }
 
-_split() {
-	local _ver="$1"
-	install_if="lua$_ver $pkgname=$pkgver-r$pkgrel"
-	pkgdesc="$_pkgdesc $_ver"
-	cd "$srcdir"/libmpack-$pkgver || return 1
-	install -Dm755 mpack.so \
-		"$subpkgdir"/usr/lib/lua/$_ver/mpack.so || return 1
-}
+_subpackage() {
+	local lver="${subpkgname:3:3}"
+	pkgdesc="$pkgdesc $lver"
+	install_if="$pkgname=$pkgver-r$pkgrel lua$lver"
 
-for _v in $_lua_versions; do
-        eval "split_${_v/./_}() { _split $_v; }"
-done
+	make -C "$builddir-$lver"/binding/lua \
+		USE_SYSTEM_LUA=yes \
+		LUA_CMOD_INSTALLDIR="$(pkg-config --variable=INSTALL_CMOD lua$lver)" \
+		DESTDIR="$subpkgdir" \
+		install
+}
 
 md5sums="7d855d6f989686fae713c10f202f5a1b  libmpack-1.0.3.tar.gz"
 sha256sums="65eb21cfa9313204ac5296e3b305d752b8422c724b6375caecc6385f0a6d6e22  libmpack-1.0.3.tar.gz"