From b305e062d8fd978d18b11f7acc383f14b9f704ce Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 6 Jun 2024 04:59:10 -0500
Subject: abuild: Use $pkgarch instead of $arch for dbg test

$arch may be set to a list, for example, "noarch !armv7".  $pkgarch is
always the "effective" arch for a package, which will evaluate to
"noarch" if the package is a noarch package.

Closes: #13
---
 abuild.in | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/abuild.in b/abuild.in
index 1d5923a..69c803b 100644
--- a/abuild.in
+++ b/abuild.in
@@ -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
-- 
cgit v1.2.3-60-g2f50