[arch-commits] Commit in luaexpat/trunk (PKGBUILD)

[Caleb Maclennan]

    Date: Friday, April 22, 2022 @ 15:03:16
  Author: alerque
Revision: 1187351

upgpkg: luaexpat 1.4.1-2; drop CFLAGS workarounds obsoleted by luarocks 3.9.0

Modified:
  luaexpat/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-22 14:53:54 UTC (rev 1187350)
+++ PKGBUILD	2022-04-22 15:03:16 UTC (rev 1187351)
@@ -6,7 +6,7 @@
 pkgbase=luaexpat
 pkgname=(lua-expat lua51-expat lua52-expat lua53-expat)
 pkgver=1.4.1
-pkgrel=1
+pkgrel=2
 _rockrel=1
 pkgdesc='SAX XML parser based on the Expat library'
 arch=('x86_64')
@@ -19,19 +19,20 @@
              lua52
              lua53
              luarocks)
+options=(debug)
 _archive="$pkgbase-$pkgver"
 _rock="$_archive-$_rockrel.linux-$CARCH.rock"
+_rockspec="$_archive-$_rockrel.rockspec"
 source=("$url/archive/$pkgver/$_archive.tar.gz")
 sha512sums=('fbc03287a237c13f395574ddf08a931ded0f457728b01bdc0a0533d212a0c908d74230be3c9e7f85a54ac244043cd853be3bf13d284185ad3e3ce6818d157635')
 
 build() {
 	cd "$_archive"
-	for LUAVER in 5.1 5.2 5.3 5.4; do
+	for LUAVER in 5.{1,2,3,4}; do
 		luarocks --lua-version "$LUAVER" \
-			CFLAGS="$CPPFLAGS $CFLAGS -fPIC -DLUA_C89_NUMBERS" \
-			LIBFLAG="$LDFLAGS -shared" \
-			make --pack-binary-rock --deps-mode none -- "rockspecs/$_archive-$_rockrel.rockspec"
-		install -Dm0644 -t "lua$LUAVER/" "$_rock"
+			CFLAGS="$CFLAGS -DLUA_C89_NUMBERS" \
+			make --pack-binary-rock --deps-mode none -- "rockspecs/$_rockspec"
+		install -Dm0644 -t "lua-$LUAVER/" "$_rock"
 	done
 }
 
@@ -39,7 +40,7 @@
 	cd "$_archive"
 	depends+=("${pkgname%-*}")
 	luarocks --lua-version "$1" --tree "$pkgdir/usr/" \
-		install --deps-mode none --no-manifest -- "lua$1/$_rock"
+		install --deps-mode none --no-manifest -- "lua-$1/$_rock"
 	install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" LICENSE
 }