Work

1 files changed, 56 insertions, 30 deletions

diff --git a/repo/lua-lpeg/lua-lpeg.xibuild b/repo/lua-lpeg/lua-lpeg.xibuild
index f2b3b4d..cb49a68 100644
--- a/repo/lua-lpeg/lua-lpeg.xibuild
+++ b/repo/lua-lpeg/lua-lpeg.xibuild
@@ -1,50 +1,76 @@
 #!/bin/sh
 
-MAKEDEPS="make tar patch lua lua5-1"
-DEPS="musl"
+NAME="lua-lpeg"
+DESC="Pattern-matching library for Lua"
+
+MAKEDEPS="lua5-1 lua"
 
 PKG_VER=1.0.2
-SOURCE=http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-$PKG_VER.tar.gz
-DESC="Pattern-matching library for Lua"
+SOURCE="http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-$PKG_VER.tar.gz"
+
 ADDITIONAL="
-    build-static-lib.patch
-    test-fix-setlocale.patch
+build-static-lib.patch
+test-fix-setlocale.patch
 "
 
 luaversions="5.1 5.4"
 
-prepare () {
-    apply_patches
+prepare() {
+	apply_patches
 
-#    lver=$(lua -v | cut -d" " -f2 | cut -d. -f-2)
 	sed -i -e 's/^CFLAGS =/CFLAGS +=/' \
 		-e 's/^COPT =/# COPT =/' \
 		makefile
 
-    for lver in $luaversions; do
-        tar xf lpeg-$PKG_VER.tar.gz
-        mv lpeg-$PKG_VER build-$lver
-    done
+	local lver; for lver in $luaversions; do
+        mkdir -p "$BUILD_ROOT/$lver"
+		tar -xf "lpeg-$PKG_VER.tar.gz"
+
+        mv "lpeg-$PKG_VER"/* "$BUILD_ROOT/$lver/"
+        cd "$BUILD_ROOT/$lver"
+
+        sed -i -e 's/^CFLAGS =/CFLAGS +=/' \
+            -e 's/^COPT =/# COPT =/' \
+            makefile
+        
+        for p in ../*.patch; do
+            patch -Np1 -i $p
+        done
+
+        cd ..
+	done
 }
 
-build () {
-    for lver in $luaversions; do
-        echo building for $lver
-        make -C build-$lver LUADIR=/usr/include/lua$lver
-    done
+build() {
+	local lver; for lver in $luaversions; do
+        echo "Building for Lua $lver..."
+		make -C "$BUILD_ROOT/$lver" LUADIR=/usr/include/lua$lver
+	done
 }
 
-package () {
-    for lver in $luaversions; do
-        cd build-$lver
-        install -Dm755 lpeg.so \
-            $PKG_DEST/usr/lib/lua/$lver/lpeg.so
-        install -Dm644 re.lua \
-            $PKG_DEST/usr/share/lua/$lver/re.lua
-
-        local rockdir="$PKG_DEST/usr/lib/luarocks/rocks-$lver/lua-lpeg/$PKG_VER-1"
-        mkdir -p "$rockdir"
-        echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
-        cd ..
+package() {
+	mkdir -p "$PKG_DEST"
+    local lver; for lver in $luaversions; do 
+        _package $lver
     done
 }
+
+_package() {
+    local lver="$1"
+	local rockdir="$PKG_DEST/usr/lib/luarocks/rocks-$lver/$_pkgname/$PKG_VER-1"
+
+	cd "$BUILD_ROOT/$lver"
+    echo "installing `pwd` "
+
+	install -Dm755 lpeg.so \
+		"$PKG_DEST"/usr/lib/lua/$lver/lpeg.so
+	install -Dm644 re.lua \
+		"$PKG_DEST"/usr/share/lua/$lver/re.lua
+
+	mkdir -p "$rockdir"
+	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
+
+    #install -Dm644 "$BUILD_ROOT-$lver"/lpeg.a \
+    #   "$PKG_DEST"/usr/lib/lua/$lver/lpeg.a
+}
+