From fc225b5b00663065567334f030f8f5abc7935253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Sat, 10 May 2014 14:55:18 +0300
Subject: [PATCH] main/lua-pc: fix install prefix, and subpkg dependencies
---
main/lua-pc/APKBUILD | 11 ++++++-----
main/lua-pc/lpc-lua5.2-compat.patch | 6 +++---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/main/lua-pc/APKBUILD b/main/lua-pc/APKBUILD
index ee96cc1e7c22..d4e708de3184 100644
--- a/main/lua-pc/APKBUILD
+++ b/main/lua-pc/APKBUILD
@@ -5,7 +5,7 @@ _luaversions="5.1 5.2"
pkgname=lua-pc
_name=lpc
pkgver=1.0.0
-pkgrel=5
+pkgrel=6
pkgdesc="Lua Process Call"
url="https://github.com/LuaDist/lpc"
arch="all"
@@ -51,10 +51,11 @@ package() {
_split_pc() {
local _ver=$1
pkgdesc="$pkgdesc for Lua $_ver"
+ depends=""
mkdir -p "$subpkgdir"
cd "$srcdir"/build-$_ver
- make install LUA_PKGCONF="lua$_ver" PREFIX="$subpkgdir"/usr
+ make install LUA_PKGCONF="lua$_ver" DESTDIR="$subpkgdir"
}
for _i in $_luaversions; do
@@ -62,8 +63,8 @@ for _i in $_luaversions; do
done
md5sums="a8cd8b0c190e7d72dd7ec2f76e74e3c8 lpc-1.0.0.tar.gz
-7ef6e6439837a31ca4e9ea63c6a887b1 lpc-lua5.2-compat.patch"
+7bc2dc6e9d58a888134f7ae1b8c415de lpc-lua5.2-compat.patch"
sha256sums="2fbbdfbbfa03a70792bb83655f3e1f990fcb972c55a074717ba417514261805c lpc-1.0.0.tar.gz
-c495eafd855f964a95dfea16e0ca4670a2b92463ae4157136ed61f9802ba79f1 lpc-lua5.2-compat.patch"
+e5290b6a67f674cfa527dce574857cadd61336fd26140a2937f9781b602f2bae lpc-lua5.2-compat.patch"
sha512sums="a955f802b9ea7c4615b8b22b1f4ab540d41e4ddb0edb5e1b77f2f2e1472c49248cb276f8bfec6b929d23ef01681a0018db6cbd401ade1cc1eb366b0a6ace9772 lpc-1.0.0.tar.gz
-ff731dd87ed4e9d4f0651747ed2d39a45cf6a637f279f4f9c40209f1b3ee54093a069e6d3adcf19399a07a3b32077fc15e73f35c908df32c3b8369b57af93f87 lpc-lua5.2-compat.patch"
+9b8215cffeea409dd182e8d67ee24f82280fbb27e4871c482b24d5e3ce0814efda312bd84d720c08a95ed343b94c3ce86745cc24bd3d4937fc5c87167ac2063a lpc-lua5.2-compat.patch"
diff --git a/main/lua-pc/lpc-lua5.2-compat.patch b/main/lua-pc/lpc-lua5.2-compat.patch
index 17a9aaab4b65..b9755158c366 100644
--- a/main/lua-pc/lpc-lua5.2-compat.patch
+++ b/main/lua-pc/lpc-lua5.2-compat.patch
@@ -1,6 +1,6 @@
diff -ru lpc-1.0.0.orig/Makefile lpc-1.0.0/Makefile
--- lpc-1.0.0.orig/Makefile 2012-08-21 17:39:10.000000000 -0300
-+++ lpc-1.0.0/Makefile 2014-05-10 13:52:18.833865486 -0300
++++ lpc-1.0.0/Makefile 2014-05-10 14:53:46.200555972 -0300
@@ -1,16 +1,20 @@
-LUA_PREFIX = /usr/local/
-PREFIX = /usr/local/
@@ -14,7 +14,7 @@ diff -ru lpc-1.0.0.orig/Makefile lpc-1.0.0/Makefile
+$(error $(LUA_PKGCONF).pc not found)
+endif
+
-+INSTALL_PREFIX = $(PREFIX)$(shell pkg-config $(LUA_PKGCONF) --variable=INSTALL_CMOD)
++INSTALL_PREFIX = $(DESTDIR)$(shell pkg-config $(LUA_PKGCONF) --variable=INSTALL_CMOD)
CC = gcc
TARGET = lpc.so
@@ -29,7 +29,7 @@ diff -ru lpc-1.0.0.orig/Makefile lpc-1.0.0/Makefile
diff -ru lpc-1.0.0.orig/lpc.c lpc-1.0.0/lpc.c
--- lpc-1.0.0.orig/lpc.c 2012-08-21 17:39:10.000000000 -0300
-+++ lpc-1.0.0/lpc.c 2014-05-10 13:51:01.740949801 -0300
++++ lpc-1.0.0/lpc.c 2014-05-10 14:53:18.784037834 -0300
@@ -192,7 +192,7 @@
lua_settable (L, -3);
}
--
GitLab