diff options
Diffstat (limited to 'main/abuild/0001-abuild-set-e-fix-for-update_config_-sub-guess.patch')
-rw-r--r-- | main/abuild/0001-abuild-set-e-fix-for-update_config_-sub-guess.patch | 57 |
1 files changed, 57 insertions, 0 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 + |