diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-05-02 15:36:42 -0300 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-07-17 09:27:45 +0000 |
| commit | 1dd4382ea11428d32c36c099d65b1ba46d946764 (patch) | |
| tree | e110a08cb0d1e6b677308f2231d5d80e99179492 /abuild.in | |
| parent | f6bcaee8951aef8de5eff619a93bdbd23720ec42 (diff) | |
abuild.in: make is_x_package functions reliant on being given a name
Diffstat (limited to 'abuild.in')
| -rw-r--r-- | abuild.in | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1114,7 +1114,7 @@ dir_has_arch_binaries() { # returns true if this is the -dev package is_dev_pkg() { - test "${subpkgname%-dev}" != "$subpkgname" + test "${1%-dev}" != "$1" } # returns true if this is the -static package @@ -1139,7 +1139,7 @@ archcheck() { [ "${subpkgarch:-$pkgarch}" != "noarch" ] && return 0 error "Arch specific binaries found so arch must not be set to \"noarch\"" 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 warning "No arch specific binaries found so arch should probably be set to \"noarch\"" fi |