Module Name: pkgsrc-wip
Committed By: Jason Bacon <bacon4000%gmail.com@localhost>
Pushed By: outpaddling
Date: Sat May 31 15:32:04 2025 -0500
Changeset: 161943ff881f95b928b394e4457742538759a006
Modified Files:
isa-l/Makefile
isa-l/PLIST
isa-l/distinfo
Added Files:
isa-l/patches/patch-Makefile.am
isa-l/patches/patch-configure.ac
Removed Files:
isa-l/patches/patch-igzip_igzip.c
isa-l/patches/patch-igzip_igzip__inflate.c
Log Message:
isa-l: Update to 2.31.1 and fix build on macOS aarch64
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=161943ff881f95b928b394e4457742538759a006
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
isa-l/Makefile | 2 +-
isa-l/PLIST | 1 -
isa-l/distinfo | 8 ++++---
isa-l/patches/patch-Makefile.am | 36 ++++++++++++++++++++++++++++++
isa-l/patches/patch-configure.ac | 17 ++++++++++++++
isa-l/patches/patch-igzip_igzip.c | 15 -------------
isa-l/patches/patch-igzip_igzip__inflate.c | 15 -------------
7 files changed, 59 insertions(+), 35 deletions(-)
diffs:
diff --git a/isa-l/Makefile b/isa-l/Makefile
index 65fd22ad89..8450194e40 100644
--- a/isa-l/Makefile
+++ b/isa-l/Makefile
@@ -5,7 +5,7 @@
# Wed May 31 10:55:57 CDT 2023 #
###########################################################
-DISTNAME= isa-l-2.30.0
+DISTNAME= isa-l-2.31.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=01org/}
GITHUB_TAG= v${PKGVERSION_NOREV}
diff --git a/isa-l/PLIST b/isa-l/PLIST
index a4ef3a244d..2ab929f7fe 100644
--- a/isa-l/PLIST
+++ b/isa-l/PLIST
@@ -9,7 +9,6 @@ include/isa-l/igzip_lib.h
include/isa-l/mem_routines.h
include/isa-l/raid.h
include/isa-l/test.h
-include/isa-l/types.h
lib/libisal.la
lib/pkgconfig/libisal.pc
man/man1/igzip.1
diff --git a/isa-l/distinfo b/isa-l/distinfo
index f0381fd13a..1b6071ba4c 100644
--- a/isa-l/distinfo
+++ b/isa-l/distinfo
@@ -1,7 +1,9 @@
$NetBSD$
-BLAKE2s (isa-l-2.30.0.tar.gz) = 5e6b9b199aaa6b8ac2b5b2f812508541057167d31a9b104df7fe2a60df7f58d7
-SHA512 (isa-l-2.30.0.tar.gz) = d3ecfb7326097534b06a74b584100336509525ae7cadc6112d0c27e3d8704f3810e18f583d3cc33fa266bfec96db023607622b22ddbf17988ec4bf1bb3b3b9b2
-Size (isa-l-2.30.0.tar.gz) = 649389 bytes
+BLAKE2s (isa-l-2.31.1.tar.gz) = 8269f27432f7a7ce668f341b93ac48765acbcc685b36796e94e6e482adad81cb
+SHA512 (isa-l-2.31.1.tar.gz) = 65199d054af1edc26d477883f7878f25fd4db65622aa98247069f1296c5f07b75da24f0361a6c3889ddb3168d940b508cd2f6340548a62ff3157977179fd002d
+Size (isa-l-2.31.1.tar.gz) = 741732 bytes
+SHA1 (patch-Makefile.am) = 2c29e6c8ae32eb6e9928b02a09daecd685f218fe
+SHA1 (patch-configure.ac) = c829aa3be94d52c6fdc5cb95d3507b683ab0ca3f
SHA1 (patch-igzip_igzip.c) = bccd90c8460ceb3c5c11ac4278e1bb7b26431d0a
SHA1 (patch-igzip_igzip__inflate.c) = 8c1b0bc4711d4a2be63d8c063e917b50c1237a5f
diff --git a/isa-l/patches/patch-Makefile.am b/isa-l/patches/patch-Makefile.am
new file mode 100644
index 0000000000..5545ce5b9d
--- /dev/null
+++ b/isa-l/patches/patch-Makefile.am
@@ -0,0 +1,36 @@
+--- 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 " $@;
diff --git a/isa-l/patches/patch-configure.ac b/isa-l/patches/patch-configure.ac
new file mode 100644
index 0000000000..537bb19853
--- /dev/null
+++ b/isa-l/patches/patch-configure.ac
@@ -0,0 +1,17 @@
+--- 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"])
+
diff --git a/isa-l/patches/patch-igzip_igzip.c b/isa-l/patches/patch-igzip_igzip.c
deleted file mode 100644
index 990daa2d2a..0000000000
--- a/isa-l/patches/patch-igzip_igzip.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-# NetBSD bswap hack
-
---- igzip/igzip.c.orig 2023-05-31 16:16:39.867982257 +0000
-+++ igzip/igzip.c
-@@ -54,7 +54,7 @@
- #include "igzip_wrapper.h"
- #include "unaligned.h"
-
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <sys/types.h>
- #include <sys/endian.h>
- # define to_be32(x) bswap32(x)
diff --git a/isa-l/patches/patch-igzip_igzip__inflate.c b/isa-l/patches/patch-igzip_igzip__inflate.c
deleted file mode 100644
index 8c40279d4a..0000000000
--- a/isa-l/patches/patch-igzip_igzip__inflate.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-# NetBSD bswap hack
-
---- igzip/igzip_inflate.c.orig 2023-05-31 16:18:23.382475799 +0000
-+++ igzip/igzip_inflate.c
-@@ -39,7 +39,7 @@
- #include "static_inflate.h"
- #endif
-
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <sys/types.h>
- #include <sys/endian.h>
- # define bswap_32(x) bswap32(x)