diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-04 13:15:15 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-04 13:15:15 +0000 |
| commit | 3bce7aff1258c80727c5dc8343baa98c6cdc39c5 (patch) | |
| tree | 2ec7d0e5bedb83c1f272fe213843edb81abe864e /main/abuild | |
| parent | ebd7d67c0be6e7a7636ec889cc3c9cc1159ee9ec (diff) | |
| download | aports-3bce7aff1258c80727c5dc8343baa98c6cdc39c5.tar.bz2 aports-3bce7aff1258c80727c5dc8343baa98c6cdc39c5.tar.xz | |
main/abuild: set -e fix
Diffstat (limited to 'main/abuild')
| -rw-r--r-- | main/abuild/0001-abuild-set-e-fix-for-update_config_-sub-guess.patch | 57 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 6 |
2 files changed, 61 insertions, 2 deletions
diff --git a/main/abuild/0001-abuild-set-e-fix-for-update_config_-sub-guess.patch b/main/abuild/0001-abuild-set-e-fix-for-update_config_-sub-guess.patch new file mode 100644 index 0000000000..4fb27e3606 --- /dev/null +++ b/main/abuild/0001-abuild-set-e-fix-for-update_config_-sub-guess.patch @@ -0,0 +1,57 @@ +From ecc1f509c6d469223cfbf4ef3f7c574de286ba6e Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 4 Apr 2017 13:12:48 +0000 +Subject: [PATCH] abuild: set -e fix for update_config_{sub,guess} + +--- + abuild.in | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +diff --git a/abuild.in b/abuild.in +index f435ffc..c201eb2 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -532,8 +532,7 @@ mkusers() { + + # helper to update config.sub to a recent version + update_config_sub() { +- local changed=false +- find . -name config.sub | while read f; do ++ find . -name config.sub | (local changed=false; while read f; do + if ! ./$f armv6-alpine-linux-muslgnueabihf 2>/dev/null; then + msg "Updating $f" + cp "$datadir"/${f##*/} "$f" || return 1 +@@ -541,16 +540,12 @@ update_config_sub() { + else + msg "No update needed for $f" + fi +- # pipe subshell will return status of last command +- $changed +- done +- return $? ++ done; $changed) + } + + # helper to update config.guess to a recent version + update_config_guess() { +- local changed=false +- find . -name config.guess | while read f; do ++ find . -name config.guess | (local changed=false; while read f; do + if grep -q aarch64 "$f" && grep -q ppc64le "$f"; then + msg "No update needed for $f" + else +@@ -558,10 +553,7 @@ update_config_guess() { + cp "$datadir"/${f##*/} "$f" || return 1 + changed=true + fi +- # pipe subshell will return status of last command +- $changed +- done +- return $? ++ done; $changed) + } + + runpart() { +-- +2.12.2 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index d7d76e4ee2..14ef16b08d 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,7 +2,7 @@ pkgname=abuild pkgver=3.0.0_rc2 _ver=${pkgver%_git*} -pkgrel=2 +pkgrel=3 pkgdesc="Script to build Alpine Packages" url="http://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -22,6 +22,7 @@ pkggroups="abuild" source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz 0001-abuild-use-new-PKG_CONFIG_MAXIMUM_TRAVERSE_DEPTH-env.patch 0001-abuild-wrap-check-with-fakeroot.patch + 0001-abuild-set-e-fix-for-update_config_-sub-guess.patch " builddir="$srcdir/$pkgname-$_ver" @@ -66,4 +67,5 @@ gems() { sha512sums="bb6fa7af3144db99839c24db63e17179d73f659a76c86d530923158b37fad3fcd73ea992f9d5f4ac3c48c13ccebb62ffbe461b3871dcb4b7b1ca6efd934e4be2 abuild-3.0.0_rc2.tar.xz 65e0605a23a5f8df6024533b054ce6e098bfc1431220d8487e9d5f521aede7c0c8fc47f5f119d868da48d8f69e6fbc3fe101f71e3415a66797829623bb5a7a48 0001-abuild-use-new-PKG_CONFIG_MAXIMUM_TRAVERSE_DEPTH-env.patch -0e5b64ad175efc4a06197a5e131878e5532539c78ffd8d5aa28a99c9684aa6eec8bc95fdca1c99b916a58c61ddf8d0b7602b1bc9aee276f7a40d82f970c0ad7c 0001-abuild-wrap-check-with-fakeroot.patch" +0e5b64ad175efc4a06197a5e131878e5532539c78ffd8d5aa28a99c9684aa6eec8bc95fdca1c99b916a58c61ddf8d0b7602b1bc9aee276f7a40d82f970c0ad7c 0001-abuild-wrap-check-with-fakeroot.patch +dda641f0ce2bddc8f3d7cf4a3538afe699bda56a5172bd56104de7252796da20025ed36f9401220d8e2fd072297efad94da4be4ed8831e9f9d14ad75c9c8859d 0001-abuild-set-e-fix-for-update_config_-sub-guess.patch" |