From d348198b2b828f671565b470da85b7d66177c1b6 Mon Sep 17 00:00:00 2001
From: Andy Fiddaman <illumos@fiddaman.net>
Date: Sun, 25 Feb 2024 10:30:31 +0000
Subject: [PATCH] Support building pkg on aarch64 again

---
 src/pkg/Makefile          | 10 +++++++++-
 src/pkg/transforms/pynext |  6 ++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/pkg/Makefile b/src/pkg/Makefile
index 7ce6760fd..1ea982529 100644
--- a/src/pkg/Makefile
+++ b/src/pkg/Makefile
@@ -56,7 +56,8 @@ PKGSEND_OPTS      = --no-index --no-catalog
 PKGPUBLISHER      = pkg5-nightly
 PKGPUBLISHER_LOCALIZABLE      = pkg5-localizable
 
-POUND_SIGN:sh     = echo \\043
+PRE_POUND         = pre\#
+POUND_SIGN        = $(PRE_POUND:pre\%=%)
 PUBLISHALL        = $(POUND_SIGN)
 # This won't work if we obsolete a package in an update build, but shouldn't be
 # necessary after we stop publishing duplicate packages.
@@ -110,10 +111,17 @@ PM_TRANSFORMS     += pynext
 
 i386_DEFINES      = \
 	i386_ONLY=''    \
+	aarch64_ONLY=$(POUND_SIGN) \
+	sparc_ONLY=$(POUND_SIGN)
+
+aarch64_DEFINES      = \
+	i386_ONLY=$(POUND_SIGN)    \
+	aarch64_ONLY='' \
 	sparc_ONLY=$(POUND_SIGN)
 
 sparc_DEFINES     = \
 	i386_ONLY=$(POUND_SIGN) \
+	aarch64_ONLY=$(POUND_SIGN) \
 	sparc_ONLY=''
 
 ARCH_DEFINES      = $($(ARCH)_DEFINES)
diff --git a/src/pkg/transforms/pynext b/src/pkg/transforms/pynext
index ae4aad2d7..530b102bf 100644
--- a/src/pkg/transforms/pynext
+++ b/src/pkg/transforms/pynext
@@ -26,9 +26,11 @@
 <transform path=TBD -> edit path 3.11 3.12>
 
 # During the 3.11 to 3.12 upgrade, we need to also translate the loadable
-# module names as they were (incorrectly) unqualified with 3.11
-<transform path=TBD \
+# module names as they were unqualified with 3.11
+$(i386_ONLY)<transform path=TBD \
     -> edit path cpython-312.so cpython-312-x86_64-pc-solaris2.so >
+$(aarch64_ONLY)<transform path=TBD \
+    -> edit path cpython-312.so cpython-312-aarch64-unknown-solaris2.so >
 
 <transform path=TBD -> edit path TBD ''>