summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2015-02-27 13:00:39 +0000
committerCarlo Landmeter <clandmeter@gmail.com>2015-02-27 13:00:39 +0000
commitfd8c65c15f6f5548331ba559633fad727480958f (patch)
tree95404f5e9deb66baecd6bd0375be4852168769d8
parent9f25e84aeea2d6813f296dcec58f6d1b1f74ce2e (diff)
downloadaports-fd8c65c15f6f5548331ba559633fad727480958f.tar.bz2
aports-fd8c65c15f6f5548331ba559633fad727480958f.tar.xz
testing/lua-turbo: fix bindir
-rw-r--r--testing/lua-turbo/APKBUILD21
-rw-r--r--testing/lua-turbo/fix-bindir.patch10
2 files changed, 23 insertions, 8 deletions
diff --git a/testing/lua-turbo/APKBUILD b/testing/lua-turbo/APKBUILD
index 0b31c6460..c5cc2585a 100644
--- a/testing/lua-turbo/APKBUILD
+++ b/testing/lua-turbo/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=lua-turbo
pkgver=1.1
-pkgrel=0
+pkgrel=1
pkgdesc="a framework built for LuaJIT 2 and Linux"
url="http://www.turbolua.org/"
arch="all"
@@ -11,8 +11,9 @@ depends="luajit"
depends_dev=""
makedepends="$depends_dev openssl-dev"
install=""
-subpackages="$pkgname-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/kernelsauce/turbo/archive/v$pkgver.tar.gz"
+subpackages=""
+source="$pkgname-$pkgver.tar.gz::https://github.com/kernelsauce/turbo/archive/v$pkgver.tar.gz
+ fix-bindir.patch"
_builddir="$srcdir/turbo-$pkgver"
@@ -28,14 +29,18 @@ prepare() {
build() {
cd "$_builddir"
- make || return 1
+ make PREFIX=/usr LUAJIT_VERSION=2.0.3 || return 1
}
package() {
cd "$_builddir"
- make -j1 PREFIX="$pkgdir"/usr install || return 1
+ make PREFIX="$pkgdir"/usr \
+ LUAJIT_VERSION=2.0.3 install || return 1
}
-md5sums="2224ced034263710e4d3e77ed3cb3671 lua-turbo-1.1.tar.gz"
-sha256sums="35427a613e517ddb8b5a7964bba46b13482543bc1ba733d8f9026a56886351dc lua-turbo-1.1.tar.gz"
-sha512sums="232998411ccc67f3d13916861a1bfe893229625a645f8f9daa8834a33a22206bff759a62edb14a0c6cfaabead0ba71d07c5b9b80e393b3658c8aa564f362422c lua-turbo-1.1.tar.gz"
+md5sums="2224ced034263710e4d3e77ed3cb3671 lua-turbo-1.1.tar.gz
+5fbc1fcf73ef48998a90b06df782162c fix-bindir.patch"
+sha256sums="35427a613e517ddb8b5a7964bba46b13482543bc1ba733d8f9026a56886351dc lua-turbo-1.1.tar.gz
+d676d0cd520759f293afdb59e59024a4ad30a8c419ab348e6acc1e72a1bb90a4 fix-bindir.patch"
+sha512sums="232998411ccc67f3d13916861a1bfe893229625a645f8f9daa8834a33a22206bff759a62edb14a0c6cfaabead0ba71d07c5b9b80e393b3658c8aa564f362422c lua-turbo-1.1.tar.gz
+e8ce4427bcf7040fdf3f711a533a0857d9dcf3678334fd4b32917642cb1a5c540ade3d3c8e26bc6b8a7ce0ff6c6f64c92eda70edec3874e7aa3507acb82c2211 fix-bindir.patch"
diff --git a/testing/lua-turbo/fix-bindir.patch b/testing/lua-turbo/fix-bindir.patch
new file mode 100644
index 000000000..92bb5ef9d
--- /dev/null
+++ b/testing/lua-turbo/fix-bindir.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.orig
++++ b/Makefile
+@@ -89,6 +89,7 @@
+ @echo "==== $(LUAJIT_LIBRARYDIR) and ===="
+ @echo "==== $(LUAJIT_MODULEDIR) ===="
+ $(MKDIR) $(INSTALL_LIB)
++ $(MKDIR) $(INSTALL_BIN)
+ $(MKDIR) $(LUA_MODULEDIR)/turbo
+ $(MKDIR) $(LUAJIT_MODULEDIR)/turbo
+ $(CP_R) turbo/* $(LUA_MODULEDIR)/turbo