From 471f8326818e66d3198631518225a87267b6f8da Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 1 Mar 2018 14:28:53 -0600
Subject: system/abuild: add our functions patch

---
 system/abuild/APKBUILD                    |  5 +--
 system/abuild/adelie-customisations.patch | 56 +++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 system/abuild/adelie-customisations.patch

diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD
index cd2bcb0ee..6eb1adcda 100644
--- a/system/abuild/APKBUILD
+++ b/system/abuild/APKBUILD
@@ -2,11 +2,11 @@
 pkgname=abuild
 pkgver=3.1.0
 _ver=${pkgver%_git*}
-pkgrel=1
+pkgrel=2
 pkgdesc="Script to build Alpine Packages"
 url="http://git.alpinelinux.org/cgit/abuild/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="fakeroot sudo pax-utils openssl apk-tools>=2.0.7-r1 libc-utils
 	attr libarchive-tools pkgconf patch lzip"
 if [ "$CBUILD" = "$CHOST" ]; then
@@ -23,6 +23,7 @@ pkggroups="abuild"
 source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
 	posix-abuild.patch
 	newapkbuild-cmake.patch
+	adelie-customisations.patch
 	0001-abuild-add-env-option-to-require-tests.patch
 	"
 builddir="$srcdir/$pkgname-$_ver"
diff --git a/system/abuild/adelie-customisations.patch b/system/abuild/adelie-customisations.patch
new file mode 100644
index 000000000..178b2538c
--- /dev/null
+++ b/system/abuild/adelie-customisations.patch
@@ -0,0 +1,56 @@
+diff --git a/functions.sh.in b/functions.sh.in
+index 4f2c023..a4de25c 100644
+--- a/functions.sh.in
++++ b/functions.sh.in
+@@ -5,20 +5,20 @@ program=${0##*/}
+ 
+ arch_to_hostspec() {
+ 	case "$1" in
+-	aarch64)	echo "aarch64-alpine-linux-musl" ;;
+-	armel)		echo "armv5-alpine-linux-musleabi" ;;
+-	armhf)		echo "armv6-alpine-linux-muslgnueabihf" ;;
+-	armv7)		echo "armv7-alpine-linux-musleabihf" ;;
+-	mips)           echo "mips-alpine-linux-musl" ;;
+-	mips64)         echo "mips64-alpine-linux-musl" ;;
+-	mipsel)         echo "mipsel-alpine-linux-musl" ;;
+-	mips64el)       echo "mips64el-alpine-linux-musl" ;;
+-	ppc)		echo "powerpc-alpine-linux-musl" ;;
+-	ppc64)		echo "powerpc64-alpine-linux-musl" ;;
+-	ppc64le)	echo "powerpc64le-alpine-linux-musl" ;;
+-	s390x)		echo "s390x-alpine-linux-musl" ;;
+-	x86)		echo "i586-alpine-linux-musl" ;;
+-	x86_64)		echo "x86_64-alpine-linux-musl" ;;
++	aarch64)	echo "aarch64-foxkit-linux-musl" ;;
++	armel)		echo "armv5-foxkit-linux-musleabi" ;;
++	armhf)		echo "armv6-foxkit-linux-muslgnueabihf" ;;
++	armv7)		echo "armv7-foxkit-linux-musleabihf" ;;
++	i528)		echo "pentium4-foxkit-linux-musl" ;;
++	mips)		echo "mips-foxkit-linux-musl" ;;
++	mips32)		echo "mips32el-foxkit-linux-musl" ;;
++	pmmx)		echo "i586-foxkit-linux-musl" ;;
++	ppc)		echo "powerpc-foxkit-linux-musl" ;;
++	ppc64)		echo "powerpc64-foxkit-linux-musl" ;;
++	ppc64le)	echo "powerpc64le-foxkit-linux-musl" ;;
++	s390x)		echo "s390x-foxkit-linux-musl" ;;
++	x86)		echo "i486-foxkit-linux-musl" ;;
++	x86_64)		echo "x86_64-foxkit-linux-musl" ;;
+ 	*)		echo "unknown" ;;
+ 	esac
+ }
+@@ -29,11 +29,11 @@ hostspec_to_arch() {
+ 	arm*-*-*-*eabi)		echo "armel" ;;
+ 	armv6*-*-*-*eabihf)	echo "armhf" ;;
+ 	armv7*-*-*-*eabihf)	echo "armv7" ;;
+-	i[0-9]86-*-*-*)		echo "x86" ;;
+-	mips-*-*-*)             echo "mips" ;;
+-	mips64-*-*-*)           echo "mips64" ;;
+-	mipsel-*-*-*)           echo "mipsel" ;;
+-	mips64el-*-*-*)         echo "mips64el" ;;
++	i486-*-*-*)		echo "x86" ;;
++	i586-*-*-*)		echo "pmmx" ;;
++	mips32*-*-*-*)		echo "mips32" ;;
++	mips*-*-*-*)		echo "mips" ;;
++	pentium4-*-*-*)		echo "i528" ;;
+ 	powerpc-*-*-*)		echo "ppc" ;;
+ 	powerpc64-*-*-*)	echo "ppc64" ;;
+ 	powerpc64le-*-*-*)	echo "ppc64le" ;;
-- 
cgit v1.2.3-70-g09d2