main/abuild: fix arch per subpackage

ref #4491
ref #4517

2 files changed, 59 insertions, 4 deletions

diff --git a/main/abuild/0001-abuild-fix-dep-scanning-when-sub-and-main-pkg-s-arch.patch b/main/abuild/0001-abuild-fix-dep-scanning-when-sub-and-main-pkg-s-arch.patch
new file mode 100644
index 0000000000..cb4c9f1c4b
--- /dev/null
+++ b/main/abuild/0001-abuild-fix-dep-scanning-when-sub-and-main-pkg-s-arch.patch
@@ -0,0 +1,51 @@
+From b8b492924505656dd45f6e3720203e1f8a2dcfd4 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Mon, 10 Aug 2015 07:52:45 +0000
+Subject: [PATCH] abuild: fix dep-scanning when sub and main pkg's arch differs
+
+Force dependency scanning when main pkg has noarch but subpackage
+overrides it. We need to save the arch setting set in split func for
+later if it differs from main pkg's arch in a temp file because the
+splitfunc runs in a subprocess.
+
+fixes #4491
+---
+ abuild.in | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/abuild.in b/abuild.in
+index 41822af..01b4b62 100644
+--- a/abuild.in
++++ b/abuild.in
+@@ -690,6 +690,7 @@ pre_split() {
+ 	# the subpackages should not inherit those form main package
+ 	provides=""
+ 	install_if=""
++	apkbuild_arch="$arch"
+ }
+ 
+ prepare_subpackages() {
+@@ -796,6 +797,11 @@ prepare_metafiles() {
+ #		parch="noarch"
+ #	fi
+ 
++	# save arch incase subpackages set it different than main pkg
++	if [ "${apkbuild_arch:-$arch}" != "$arch" ]; then
++		echo "$arch" > "$controldir"/.arch
++	fi
++
+ 	echo "# Generated by $(basename $0) $program_version" >"$pkginfo"
+ 	if [ -n "$FAKEROOTKEY" ]; then
+ 		echo "# using $($FAKEROOT -v)" >> "$pkginfo"
+@@ -1115,7 +1121,7 @@ scan_shared_objects() {
+ 	local name="$1" controldir="$2" datadir="$3"
+ 	local opt= i=
+ 
+-	if [ "$arch" = "noarch" ]; then
++	if [ "$arch" = "noarch" ] && ! [ -e "$controldir"/.arch ]; then
+ 		return 0
+ 	fi
+ 
+-- 
+2.5.0
+
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index f0da7da5fa..02d2cde421 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=abuild
 pkgver=2.23.0
 _ver=${pkgver%_git*}
-pkgrel=4
+pkgrel=5
 pkgdesc="Script to build Alpine Packages"
 url="http://git.alpinelinux.org/cgit/abuild/"
 arch="all"
@@ -23,6 +23,7 @@ source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
 	0001-abuild-fix-circular-dependency-for-symlink-deps.patch
 	0002-apkbuild-gem-resolver-fix-syntax.patch
 	0001-abuild-add-install_if-for-doc-packages.patch
+	0001-abuild-fix-dep-scanning-when-sub-and-main-pkg-s-arch.patch
 	"
 
 _builddir="$srcdir/$pkgname-$_ver"
@@ -70,12 +71,15 @@ gems() {
 md5sums="864090a6016b3424d7b6bb31e84db3f0  abuild-2.23.0.tar.xz
 c8ef8f4155d445842cc20379dbe01ded  0001-abuild-fix-circular-dependency-for-symlink-deps.patch
 8d96bd94711cb172586a483a089bb5c8  0002-apkbuild-gem-resolver-fix-syntax.patch
-0e1061040efb1e2a8d778ff5a94ddc3e  0001-abuild-add-install_if-for-doc-packages.patch"
+0e1061040efb1e2a8d778ff5a94ddc3e  0001-abuild-add-install_if-for-doc-packages.patch
+ebadd787dba0b0fa974e1dd2cbb979bb  0001-abuild-fix-dep-scanning-when-sub-and-main-pkg-s-arch.patch"
 sha256sums="4cae7d7035955d23d1f29d4d0cd00ce225b300e6e809ff240101feea97aa7262  abuild-2.23.0.tar.xz
 2550d9d0dfeeb214aa0154b281a624f977d3b83ba678dc0f727f0c508996f26e  0001-abuild-fix-circular-dependency-for-symlink-deps.patch
 239c9b119ba91c254b86fcb700b48dd3f8aae7bc5e902ce04bc839d95478f6b3  0002-apkbuild-gem-resolver-fix-syntax.patch
-c5e57a750778894bb225775aee83e04c9891170e7ffb5313a1118ebde53d4c79  0001-abuild-add-install_if-for-doc-packages.patch"
+c5e57a750778894bb225775aee83e04c9891170e7ffb5313a1118ebde53d4c79  0001-abuild-add-install_if-for-doc-packages.patch
+711e1b0dc01bed0dc804bf6ba6407b57ea8296fb8b066f1dee59bffb00847080  0001-abuild-fix-dep-scanning-when-sub-and-main-pkg-s-arch.patch"
 sha512sums="50fc7649444079e5ba5552c2f4c57dedbdcd7b10727ed7b7bec8b4c85b37bbca1d76ab61bf3ab160520634e1742c3cd91fb294371bf653330ee0047337b6dfa9  abuild-2.23.0.tar.xz
 4c3d1d778b60de9f9e789501e52ab0f17ef5f2ea5cb05e33cc95d59b98130907bce5ed4c4808244b22f14c17b91682447599aded1579c904cee8cd269bda7c85  0001-abuild-fix-circular-dependency-for-symlink-deps.patch
 ecd774c509bf45fef15d967a185d5ab7cd4e5e2736d8979b17a8f822622db799eb2a149bedb020b7e9ce0451579a6c7e36f94eaa971b0570ecd6d7adb1a7e00a  0002-apkbuild-gem-resolver-fix-syntax.patch
-13424388183d11c49c2a73ac0c4ae8094a7a9bc279d77c274cecc7d45eceb2e5a95b4d1e3c0c74accb93fbda52d0f33219606e5fb878125544c8d638aba027f6  0001-abuild-add-install_if-for-doc-packages.patch"
+13424388183d11c49c2a73ac0c4ae8094a7a9bc279d77c274cecc7d45eceb2e5a95b4d1e3c0c74accb93fbda52d0f33219606e5fb878125544c8d638aba027f6  0001-abuild-add-install_if-for-doc-packages.patch
+57fe71d2e4c696fc436ac20646f3d91645b58876ca6def3bbe71af7e1a939edf76e7f86f9898fd81e69faebe517216f808730895277cf722e130b73a5bfa2fc1  0001-abuild-fix-dep-scanning-when-sub-and-main-pkg-s-arch.patch"