Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support building pkg on aarch64 again #474

Merged
merged 1 commit into from
Feb 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/pkg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 4 additions & 2 deletions src/pkg/transforms/pynext
Original file line number Diff line number Diff line change
Expand Up @@ -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 ''>

Loading