diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-07-06 11:20:19 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-07-06 11:20:42 +0000 |
| commit | 72c412d0cd82eee04daa00ef9ba6adb203618502 (patch) | |
| tree | 8ab6b45a2f7b4661b1dbdcbb01091c472d052d08 /main/apk-tools | |
| parent | 7412650df3959d8a6d7fa555f14d058915a8a238 (diff) | |
| download | aports-72c412d0cd82eee04daa00ef9ba6adb203618502.tar.bz2 aports-72c412d0cd82eee04daa00ef9ba6adb203618502.tar.xz | |
main/apk-tools: fix cross compile
Diffstat (limited to 'main/apk-tools')
| -rw-r--r-- | main/apk-tools/APKBUILD | 12 | ||||
| -rw-r--r-- | main/apk-tools/fix-crossbuild.patch | 14 |
2 files changed, 22 insertions, 4 deletions
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index ee03513718..367a496b06 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apk-tools pkgver=2.6.7 -pkgrel=0 +pkgrel=1 pkgdesc="Alpine Package Keeper - package manager for alpine" subpackages="$pkgname-static" depends= @@ -13,6 +13,7 @@ if [ "$CBUILD" = "$CHOST" ]; then makedepends="$makedepends lua5.2-dev" fi source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz + fix-crossbuild.patch " url="http://git.alpinelinux.org/cgit/apk-tools/" @@ -82,6 +83,9 @@ luaapk() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/ } -md5sums="cfa2a6414174fdf360ced631a48ec018 apk-tools-2.6.7.tar.xz" -sha256sums="0ce0c9d20b526a40d8a1ad5a2ee16645239c256f634305e74419f1335b5acfdf apk-tools-2.6.7.tar.xz" -sha512sums="ad27c2b0eeb66917abbfa229f5fb7b533c36c0393ba954fffce5c8a47ca030dfe8af30aa6dec95d323c51e8e0fd5b2efc59d6242b1ff592c561b5b178c0ee9fa apk-tools-2.6.7.tar.xz" +md5sums="cfa2a6414174fdf360ced631a48ec018 apk-tools-2.6.7.tar.xz +8c76a52a7865560cf9f5dc53cc8a769b fix-crossbuild.patch" +sha256sums="0ce0c9d20b526a40d8a1ad5a2ee16645239c256f634305e74419f1335b5acfdf apk-tools-2.6.7.tar.xz +daceb53e5b8abf7277630980c6bf3b5e9d7117c5cf50a233bcafb42f0f290941 fix-crossbuild.patch" +sha512sums="ad27c2b0eeb66917abbfa229f5fb7b533c36c0393ba954fffce5c8a47ca030dfe8af30aa6dec95d323c51e8e0fd5b2efc59d6242b1ff592c561b5b178c0ee9fa apk-tools-2.6.7.tar.xz +b739b94fba70e0dcb6ffd16627934ce636a4dd400c001ad27bbcb98aa40022942d62bc070eecdbeb8a1b777cd6bc14f89dea9f2806832e479e761e4ede6b8f35 fix-crossbuild.patch" diff --git a/main/apk-tools/fix-crossbuild.patch b/main/apk-tools/fix-crossbuild.patch new file mode 100644 index 0000000000..7f5dcacc4b --- /dev/null +++ b/main/apk-tools/fix-crossbuild.patch @@ -0,0 +1,14 @@ +diff --git a/src/Makefile b/src/Makefile +index 250d2f0..0e0525a 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -66,7 +66,7 @@ LDFLAGS_apk += -L$(obj) + LDFLAGS_apk-test += -L$(obj) + + CFLAGS_ALL += $(shell $(PKG_CONFIG) --cflags $(PKGDEPS)) +-LIBS := /usr/lib/libfetch.a \ ++LIBS := $(shell $(CC) -print-file-name=libfetch.a) \ + -Wl,--as-needed \ + $(shell $(PKG_CONFIG) --libs $(PKGDEPS)) \ + -Wl,--no-as-needed + |