git: ec7391b149b9 - main - devel/isa-l: Enable build on aarch64

The branch main has been updated by jwb:

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

commit ec7391b149b965867f36a51eaf96f3e397a03d96
Author:     Jason W. Bacon <jwb@FreeBSD.org>
AuthorDate: 2025-06-14 12:15:10 +0000
Commit:     Jason W. Bacon <jwb@FreeBSD.org>
CommitDate: 2025-06-14 12:15:10 +0000

    devel/isa-l: Enable build on aarch64
    
    Using generic portable code for now.
    Upstream has optimized aarch64 code, but it is not portable.
    No changes on other archs.
    
    PR:             287164
    Approved by:    sunpoet
---
 devel/isa-l/Makefile            |  4 +++-
 devel/isa-l/distinfo            |  4 +---
 devel/isa-l/files/patch-aarch64 | 53 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/devel/isa-l/Makefile b/devel/isa-l/Makefile
index d96e21dda554..c0e4b322358a 100644
--- a/devel/isa-l/Makefile
+++ b/devel/isa-l/Makefile
@@ -10,7 +10,9 @@ WWW=		https://github.com/intel/isa-l
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-ONLY_FOR_ARCHS=	amd64 powerpc64le powerpc64 powerpc
+# FIXME: aarch64 uses portable base functions for now.
+# Upstream has optimized support for aarch64, but the code is not portable.
+ONLY_FOR_ARCHS=	aarch64 amd64 powerpc powerpc64 powerpc64le
 
 BUILD_DEPENDS=	nasm:devel/nasm
 
diff --git a/devel/isa-l/distinfo b/devel/isa-l/distinfo
index 93126637cf5e..b3834fccb043 100644
--- a/devel/isa-l/distinfo
+++ b/devel/isa-l/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1738088824
+TIMESTAMP = 1749903233
 SHA256 (intel-isa-l-v2.31.1_GH0.tar.gz) = e1d5573a4019738243b568ab1e1422e6ab7557c5cae33cc8686944d327ad6bb4
 SIZE (intel-isa-l-v2.31.1_GH0.tar.gz) = 741732
-SHA256 (1b1ee1e18f5bb4d91e3839405a8557a64a3b2581.patch) = 2ee0c38621012f038cbc1f246f2a008d8a2f22cf2a9df843e630dc56ab076ae7
-SIZE (1b1ee1e18f5bb4d91e3839405a8557a64a3b2581.patch) = 1296
diff --git a/devel/isa-l/files/patch-aarch64 b/devel/isa-l/files/patch-aarch64
new file mode 100644
index 000000000000..78cfaf023388
--- /dev/null
+++ b/devel/isa-l/files/patch-aarch64
@@ -0,0 +1,53 @@
+--- Makefile.am.orig	2025-05-30 12:38:07 UTC
++++ Makefile.am
+@@ -71,12 +71,6 @@ endif
+ other_tests += ${other_tests_x86_32}
+ endif
+ 
+-if CPU_AARCH64
+-ARCH=-Daarch64
+-libisal_la_SOURCES += ${lsrc_aarch64}
+-other_tests += ${other_tests_aarch64}
+-endif
+-
+ if CPU_PPC64LE
+ ARCH=-Dppc64le
+ libisal_la_SOURCES += ${lsrc_ppc64le}
+@@ -128,20 +122,13 @@ endif
+ if USE_NASM
+   as_filter = ${srcdir}/tools/nasm-filter.sh
+ endif
+-if CPU_AARCH64
+-  as_filter = $(CC) -D__ASSEMBLY__
+-endif
+ 
+ CCAS = $(as_filter)
+ EXTRA_DIST += tools/yasm-filter.sh tools/nasm-filter.sh
+ EXTRA_DIST += tools/yasm-cet-filter.sh tools/nasm-cet-filter.sh
+ 
+ AM_CFLAGS = ${my_CFLAGS} ${INCLUDE} $(src_include) ${ARCH} ${D}
+-if CPU_AARCH64
+-AM_CCASFLAGS = ${AM_CFLAGS}
+-else
+ AM_CCASFLAGS = ${yasm_args} ${INCLUDE} ${src_include} ${DEFS} ${D}
+-endif
+ 
+ .asm.s:
+ 	@echo "  MKTMP   " $@;
+--- configure.ac.orig	2025-05-30 12:36:27 UTC
++++ configure.ac
+@@ -27,14 +27,11 @@ AS_CASE([$host_cpu],
+   [x86_64], [CPU="x86_64"],
+   [amd64], [CPU="x86_64"],
+   [i?86], [CPU="x86_32"],
+-  [aarch64], [CPU="aarch64"],
+-  [arm64], [CPU="aarch64"],
+   [powerpc64le], [CPU="ppc64le"],
+   [ppc64le], [CPU="ppc64le"],
+ )
+ AM_CONDITIONAL([CPU_X86_64], [test "$CPU" = "x86_64"])
+ AM_CONDITIONAL([CPU_X86_32], [test "$CPU" = "x86_32"])
+-AM_CONDITIONAL([CPU_AARCH64], [test "$CPU" = "aarch64"])
+ AM_CONDITIONAL([CPU_PPC64LE], [test "$CPU" = "ppc64le"])
+ AM_CONDITIONAL([CPU_UNDEFINED], [test "x$CPU" = "x"])
+