From cbee419616c86ed22b19edec27387a7b7d8d5b82 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 26 Jul 2013 11:40:42 +0000
Subject: abuild: remove post_unpack

instead, provide 'update_config_sub' and let aports that needs replace
config.sub call it.
---
 abuild.in | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

(limited to 'abuild.in')

diff --git a/abuild.in b/abuild.in
index 4e67850..a16ef27 100755
--- a/abuild.in
+++ b/abuild.in
@@ -493,24 +493,6 @@ unpack() {
 	default_unpack
 }
 
-default_post_unpack() {
-	local i
-	options_has "!configsub" && return 0
-	for i in "$srcdir"/*/configure; do
-		[ -x "$i" ] || continue
-		find "${i%/configure}" -name config.sub -o -name config.guess \
-			| while read f; do
-				msg "Replacing ${f##*/}"
-				cp "$datadir"/${f##*/} "$f" || return 1
-			done
-		break
-	done
-}
-
-post_unpack() {
-	default_post_unpack
-}
-
 # cleanup source and package dir
 clean() {
 	msg "Cleaning temporary build dirs..."
@@ -589,6 +571,13 @@ mkusers() {
 	done
 }
 
+# helper to update config.sub to a recent version
+update_config_sub() {
+	find . -name config.sub | while read f; do
+		msg "Replacing ${f##*/}"
+		cp "$datadir"/${f##*/} "$f" || return 1
+	done
+}
 
 runpart() {
 	local part=$1
@@ -1205,8 +1194,7 @@ build_abuildrepo() {
 	if ! apk_up2date || [ -n "$force" ]; then
 		logcmd "building $pkgname"
 		sanitycheck && builddeps && clean && fetch && unpack \
-			&& post_unpack && prepare && mkusers && $_build \
-			&& rootpkg \
+			&& prepare && mkusers && $_build && rootpkg \
 			|| return 1
 	fi
 	update_abuildrepo_index
-- 
cgit v1.2.3-60-g2f50