aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2016-07-14 07:16:43 +0000
committerTimo Teräs <timo.teras@iki.fi>2016-07-14 07:18:28 +0000
commit1a6399738d6b458a0c95d450d2e306dc9725aca9 (patch)
treeb861a6b040a6cf953f452453403ea963e955244b /main
parent2a5005b4dc60577853504198b2ab150eb8ed84b7 (diff)
downloadaports-1a6399738d6b458a0c95d450d2e306dc9725aca9.tar.gz
aports-1a6399738d6b458a0c95d450d2e306dc9725aca9.tar.bz2
aports-1a6399738d6b458a0c95d450d2e306dc9725aca9.tar.xz
main/apk-tools: fix aarch64 build
Diffstat (limited to 'main')
-rw-r--r--main/apk-tools/APKBUILD10
-rw-r--r--main/apk-tools/add-aarch64.patch29
2 files changed, 36 insertions, 3 deletions
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 367a496b06..acbc531ccd 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -14,6 +14,7 @@ if [ "$CBUILD" = "$CHOST" ]; then
fi
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
fix-crossbuild.patch
+ add-aarch64.patch
"
url="http://git.alpinelinux.org/cgit/apk-tools/"
@@ -84,8 +85,11 @@ luaapk() {
}
md5sums="cfa2a6414174fdf360ced631a48ec018 apk-tools-2.6.7.tar.xz
-8c76a52a7865560cf9f5dc53cc8a769b fix-crossbuild.patch"
+8c76a52a7865560cf9f5dc53cc8a769b fix-crossbuild.patch
+5e419d9ffadb3fa3993a36e45502705b add-aarch64.patch"
sha256sums="0ce0c9d20b526a40d8a1ad5a2ee16645239c256f634305e74419f1335b5acfdf apk-tools-2.6.7.tar.xz
-daceb53e5b8abf7277630980c6bf3b5e9d7117c5cf50a233bcafb42f0f290941 fix-crossbuild.patch"
+daceb53e5b8abf7277630980c6bf3b5e9d7117c5cf50a233bcafb42f0f290941 fix-crossbuild.patch
+05805f88b53fe954b3d4520afb8e0b454b5cfc20370c3f3c0cd3d09235a8bbbb add-aarch64.patch"
sha512sums="ad27c2b0eeb66917abbfa229f5fb7b533c36c0393ba954fffce5c8a47ca030dfe8af30aa6dec95d323c51e8e0fd5b2efc59d6242b1ff592c561b5b178c0ee9fa apk-tools-2.6.7.tar.xz
-b739b94fba70e0dcb6ffd16627934ce636a4dd400c001ad27bbcb98aa40022942d62bc070eecdbeb8a1b777cd6bc14f89dea9f2806832e479e761e4ede6b8f35 fix-crossbuild.patch"
+b739b94fba70e0dcb6ffd16627934ce636a4dd400c001ad27bbcb98aa40022942d62bc070eecdbeb8a1b777cd6bc14f89dea9f2806832e479e761e4ede6b8f35 fix-crossbuild.patch
+3aca8e04375bbb3f33dec6b60dcd011d7ff26d9cf326315b0f4b91ada3892ecb0599e32f9294cade6bdc8cbc36cc9fda68e19c522fe923998f3c8538c6a7b997 add-aarch64.patch"
diff --git a/main/apk-tools/add-aarch64.patch b/main/apk-tools/add-aarch64.patch
new file mode 100644
index 0000000000..83eda36fd1
--- /dev/null
+++ b/main/apk-tools/add-aarch64.patch
@@ -0,0 +1,29 @@
+From 06ae5fdfdccd0c8e6d5501d93666bd915d2604d1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Fri, 8 Jul 2016 11:09:00 +0300
+Subject: [PATCH] detect aarch64 architecture and assign default name for it
+
+---
+ src/apk_defines.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/apk_defines.h b/src/apk_defines.h
+index 2aca364..9b2e904 100644
+--- a/src/apk_defines.h
++++ b/src/apk_defines.h
+@@ -93,9 +93,10 @@ extern char **apk_argv;
+ #define APK_DEFAULT_ARCH "armhf"
+ #elif defined(__arm__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+ #define APK_DEFAULT_ARCH "armel"
++#elif defined(__aarch64__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
++#define APK_DEFAULT_ARCH "aarch64"
+ #else
+-#warning APK_DEFAULT_ARCH is not set for this architecture
+-#define APK_DEFAULT_ARCH "noarch"
++#error APK_DEFAULT_ARCH not detected for this architecture
+ #endif
+
+ #define APK_MAX_REPOS 32 /* see struct apk_package */
+--
+2.9.0
+