summaryrefslogtreecommitdiff
path: root/abuild.in
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-07-26 11:40:42 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-07-26 11:56:05 +0000
commitcbee419616c86ed22b19edec27387a7b7d8d5b82 (patch)
treeb6ca66bf0034a3706b8cab2a2c05991ddebaa83a /abuild.in
parent8112d2422a983769458b673e081c7ebdf58d1b07 (diff)
downloadabuild-cbee419616c86ed22b19edec27387a7b7d8d5b82.tar.gz
abuild-cbee419616c86ed22b19edec27387a7b7d8d5b82.tar.bz2
abuild-cbee419616c86ed22b19edec27387a7b7d8d5b82.tar.xz
abuild-cbee419616c86ed22b19edec27387a7b7d8d5b82.zip
abuild: remove post_unpack
instead, provide 'update_config_sub' and let aports that needs replace config.sub call it.
Diffstat (limited to 'abuild.in')
-rwxr-xr-xabuild.in28
1 files changed, 8 insertions, 20 deletions
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