git: 33718f6b048f - main - lang/gnat12: Fix build on aarch64

The branch main has been updated by mikael:

URL: https://cgit.FreeBSD.org/ports/commit/?id=33718f6b048fb4f37d4731783b3533c6331f6943

commit 33718f6b048fb4f37d4731783b3533c6331f6943
Author:     Jonathan Chen <jonc@chen.org.nz>
AuthorDate: 2024-11-29 12:34:30 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2024-11-29 12:35:52 +0000

    lang/gnat12: Fix build on aarch64
    
    PR:             279996
    Approved by:    thierry
---
 lang/gnat12/Makefile  | 2 +-
 lang/gnat12/pkg-plist | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lang/gnat12/Makefile b/lang/gnat12/Makefile
index ffe05d7a40d8..4d83bde70caf 100644
--- a/lang/gnat12/Makefile
+++ b/lang/gnat12/Makefile
@@ -115,7 +115,7 @@ _TOOLCHAIN_PATHS=	/sbin:/bin:/usr/sbin:/usr/bin:${_GCC6AUX_PATH}:${PREFIX}/bin:$
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == i386 || ${ARCH} == aarch64
+.if ${ARCH} == i386
 LIB_DIR_32=	""
 PLIST_SUB+=	64BITS="@comment "
 .else
diff --git a/lang/gnat12/pkg-plist b/lang/gnat12/pkg-plist
index 341689854819..5c737c909468 100644
--- a/lang/gnat12/pkg-plist
+++ b/lang/gnat12/pkg-plist
@@ -5888,16 +5888,16 @@ gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/freebsd-spec.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/freebsd-stdint.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/freebsd.h
 %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/att.h
-%%64BITS%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/biarch64.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/biarch64.h
 %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/freebsd.h
-%%64BITS%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/freebsd64.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/freebsd64.h
 %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/i386-isa.def
 %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/i386-opts.h
 %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/i386-protos.h
 %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/i386.h
 %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/stringop.def
 %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/unix.h
-%%64BITS%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/x86-64.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/x86-64.h
 %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/x86-tune.def
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/initfini-array.h
 %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/vxworks-dummy.h