diff options
Diffstat (limited to 'abuild.in')
| -rw-r--r-- | abuild.in | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -2597,8 +2597,13 @@ fi # for recursive action export REPODEST SRCDEST +if [ -z "$pkgarch" ]; then + pkgarch=$CARCH + list_has noarch $arch && pkgarch=noarch +fi + # add dbg subpackage if its enabled globally -if [ -n "$DEFAULT_DBG" ] && ! subpackage_types_has "dbg" && ! options_has "!dbg" && [ "$arch" != "noarch" ]; then +if [ -n "$DEFAULT_DBG" ] && ! subpackage_types_has "dbg" && ! options_has "!dbg" && [ "$pkgarch" != "noarch" ]; then subpackages="$pkgname-dbg $subpackages" fi @@ -2621,10 +2626,6 @@ else fi apkbuild_arch="$arch" pkgdir="$pkgbasedir/$pkgname" -if [ -z "$pkgarch" ]; then - pkgarch=$CARCH - list_has noarch $arch && pkgarch=noarch -fi controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} trap 'die "Aborted by user"' INT |