mirror of
https://gitlab.alpinelinux.org/alpine/abuild.git
synced 2024-12-26 08:52:16 +00:00
abuild: only warn when we think there should have been noarch
and we dont want -dev packages to be noarch
This commit is contained in:
parent
66966c5ccc
commit
0db502b906
12
abuild.in
12
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
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user