aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2020-11-10 07:16:11 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2020-11-10 07:17:58 +0000
commit07b78f3657d7f4006487c7366b5a6bdd2d7166c4 (patch)
tree90a49b85a18fabd0801f0b4324191e0a216be15a
parenta2a7a37b67cf34e6a04a34ab8b23ea0a1da7e2ff (diff)
downloadaports-07b78f3657d7f4006487c7366b5a6bdd2d7166c4.tar.gz
aports-07b78f3657d7f4006487c7366b5a6bdd2d7166c4.tar.bz2
aports-07b78f3657d7f4006487c7366b5a6bdd2d7166c4.tar.xz
main/apk-tools: fix generation of help.h
set lua to a real lua interpreter instead of `yes`. Executing `yes` gave unintended consequences. fixes commit d8a51893723d (main/apk-tools: fix bootstrapping)
-rw-r--r--main/apk-tools/APKBUILD16
1 files changed, 8 insertions, 8 deletions
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 8a61ec2608..bcaecf17e0 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -13,11 +13,11 @@ depends="musl>=1.2"
makedepends_build="openssl lua5.3 lua5.3-lzlib scdoc"
makedepends_host="zlib-dev openssl-dev zlib-static openssl-libs-static linux-headers"
makedepends="$makedepends_build $makedepends_host"
-lua="no"
+_lua="no"
if [ "$CBUILD" = "$CHOST" ]; then
- subpackages="$subpackages lua5.3-apk:luaapk"
- makedepends="$makedepends lua5.3-dev"
- lua="yes"
+ _lua="lua5.3"
+ subpackages="$subpackages $_lua-apk:luaapk"
+ makedepends="$makedepends $_lua-dev"
fi
source="https://gitlab.alpinelinux.org/alpine/$pkgname/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz
"
@@ -31,16 +31,16 @@ prepare() {
}
build() {
- make LUA="$lua"
- make static LUA="$lua"
+ make LUA="$_lua"
+ make static LUA="$_lua"
}
check() {
- make check LUA="$lua"
+ make check LUA="$_lua"
}
package() {
- make DESTDIR="$pkgdir" LUA="$lua" install
+ make DESTDIR="$pkgdir" LUA="$_lua" install
install -d "$pkgdir"/var/lib/apk \
"$pkgdir"/var/cache/misc \
"$pkgdir"/etc/apk/keys \