abuild.in: make is_x_package functions reliant on being given a name
This commit is contained in:
parent
f6bcaee895
commit
1dd4382ea1
|
@ -1114,7 +1114,7 @@ dir_has_arch_binaries() {
|
||||||
|
|
||||||
# returns true if this is the -dev package
|
# returns true if this is the -dev package
|
||||||
is_dev_pkg() {
|
is_dev_pkg() {
|
||||||
test "${subpkgname%-dev}" != "$subpkgname"
|
test "${1%-dev}" != "$1"
|
||||||
}
|
}
|
||||||
|
|
||||||
# returns true if this is the -static package
|
# returns true if this is the -static package
|
||||||
|
@ -1139,7 +1139,7 @@ archcheck() {
|
||||||
[ "${subpkgarch:-$pkgarch}" != "noarch" ] && return 0
|
[ "${subpkgarch:-$pkgarch}" != "noarch" ] && return 0
|
||||||
error "Arch specific binaries found so arch must not be set to \"noarch\""
|
error "Arch specific binaries found so arch must not be set to \"noarch\""
|
||||||
return 1
|
return 1
|
||||||
elif [ "${subpkgarch:-$pkgarch}" != "noarch" ] && ! is_dev_pkg && ! is_static_pkg "$subpkgname"; then
|
elif [ "${subpkgarch:-$pkgarch}" != "noarch" ] && ! is_dev_pkg "$subpkgname" && ! is_static_pkg "$subpkgname"; then
|
||||||
# we dont want -dev package go to noarch
|
# we dont want -dev package go to noarch
|
||||||
warning "No arch specific binaries found so arch should probably be set to \"noarch\""
|
warning "No arch specific binaries found so arch should probably be set to \"noarch\""
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue