summaryrefslogtreecommitdiff
path: root/abuild.in
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-01-06 20:21:33 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-03-04 22:39:48 +0000
commit0db502b90624baba22dcf7d92c1640095e24634e (patch)
tree28890e82bd2193898221af81cdc8ebc19f3e3064 /abuild.in
parent66966c5ccc501827a8993ef5348eee43703c0f86 (diff)
downloadabuild-0db502b90624baba22dcf7d92c1640095e24634e.tar.gz
abuild-0db502b90624baba22dcf7d92c1640095e24634e.tar.bz2
abuild-0db502b90624baba22dcf7d92c1640095e24634e.tar.xz
abuild-0db502b90624baba22dcf7d92c1640095e24634e.zip
abuild: only warn when we think there should have been noarch
and we dont want -dev packages to be noarch
Diffstat (limited to 'abuild.in')
-rwxr-xr-xabuild.in12
1 files changed, 8 insertions, 4 deletions
diff --git a/abuild.in b/abuild.in
index 551d759..bdb83d6 100755
--- a/abuild.in
+++ b/abuild.in
@@ -566,6 +566,11 @@ dir_has_arch_binaries() {
return 1
}
+# returns true if this is the -dev package
+is_dev_pkg() {
+ test "${subpkgname%-dev}" != "$subpkgname"
+}
+
# check that noarch is set if needed
archcheck() {
options_has "!archcheck" && return 0
@@ -573,10 +578,9 @@ archcheck() {
[ "$arch" != "noarch" ] && return 0
error "Arch specific binaries found so arch must not be set to \"noarch\""
return 1
- else
- [ "$arch" = "noarch" ] && return 0
- error "No arch specific binaries found so arch should be set to \"noarch\""
- return 1
+ elif [ "$arch" != "noarch" ] && ! is_dev_pkg; then
+ # we dont want -dev package go to noarch
+ warning "No arch specific binaries found so arch should probably be set to \"noarch\""
fi
return 0
}