From 706bd46d82601d4a13cb8d208125695609069a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Mon, 8 Jul 2013 15:23:15 +0300
Subject: main/apk-tools: upgrade to 2.4.0_rc2, and crossbuilding fixes

* don't build lua support during crossbuild
* strip using cross tools
---
 main/apk-tools/APKBUILD | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'main')

diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 8a6ad38078..fb075c486f 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,11 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apk-tools
-pkgver=2.4.0_rc1
+pkgver=2.4.0_rc2
 pkgrel=0
 pkgdesc="Alpine Package Keeper - package manager for alpine"
-subpackages="$pkgname-static lua-apk:luaapk"
+subpackages="$pkgname-static"
 depends=
-makedepends="zlib-dev openssl-dev lua-dev"
+makedepends="zlib-dev openssl-dev"
+if [ "$CBUILD" == "$CHOST" ]; then
+	subpackages="$subpackages lua-apk:luaapk"
+	makedepends="$makedepends lua-dev"
+fi
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
 	"
 
@@ -24,7 +28,11 @@ prepare() {
 	done
 
 	echo "FULL_VERSION=$pkgver-r$pkgrel" > config.mk || return 1
-	echo "LUAAPK=YesPlease" >> config.mk
+	if [ "$CBUILD" = "$CHOST" ]; then
+		echo "LUAAPK=YesPlease" >> config.mk
+	else
+		echo "LUAAPK=" >> config.mk
+	fi
 	echo "export LUAAPK" >> config.mk
 }
 
@@ -60,7 +68,7 @@ static() {
 	local privkey="$PACKAGER_PRIVKEY"
 	local pubkey=${PACKAGER_PUBKEY:-"${privkey}.pub"}
 	local keyname=${pubkey##*/}
-	strip "$subpkgdir"/sbin/apk.static
+	${CROSS_COMPILE}strip "$subpkgdir"/sbin/apk.static
 	openssl dgst -sha1 -sign "$privkey" \
 		-out "$subpkgdir"/sbin/apk.static.SIGN.RSA.$keyname \
 		"$subpkgdir"/sbin/apk.static || return 1
@@ -72,6 +80,6 @@ luaapk() {
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/
 }
 
-md5sums="377294d87740693c32a668a2963fff24  apk-tools-2.4.0_rc1.tar.xz"
-sha256sums="6ccf53cb6054f7f1f43da1fdc7038dc62871444b79fd5fe52727ea6d9840e945  apk-tools-2.4.0_rc1.tar.xz"
-sha512sums="204d0d146f6775fa7faa284a6b1667958c2acd148aa61cd24bea3abffd6ccf509ea74f5af3f628b63f111932432462738b0eb1dbeed2f15298e25d035168d468  apk-tools-2.4.0_rc1.tar.xz"
+md5sums="970ac62007eb16f30344bf9169765067  apk-tools-2.4.0_rc2.tar.xz"
+sha256sums="89e0a4d91b2eab372fdbd488f45c9db8c0c947bbe690c626b0160b3f338bac5b  apk-tools-2.4.0_rc2.tar.xz"
+sha512sums="08e2cae4e55602800d09db7951bec297ed4e3251a1e5df87a2437b44608db7560533af5994cc0902e8f5f505d388af6d89295f85245d2fc30d028b2e59a6d496  apk-tools-2.4.0_rc2.tar.xz"
-- 
cgit v1.2.3