filesystems/openzfs-kmod: unbreak build on 15-CURRENT-arm64

Patched module/Makefile.bsd submitted upstream as OpenZFS PR 17219
This commit is contained in:
Martin Matuska 2025-04-04 22:41:42 +02:00
parent a91bf8c294
commit 2d635abe9c
2 changed files with 70 additions and 0 deletions

View file

@ -1,5 +1,6 @@
PORTNAME= openzfs
PORTVERSION= 2.3.1
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= filesystems sysutils
MASTER_SITES= https://github.com/openzfs/zfs/releases/download/zfs-${PORTVERSION}/

View file

@ -0,0 +1,69 @@
--- Makefile.bsd.orig 2025-03-10 22:54:55 UTC
+++ Makefile.bsd
@@ -90,19 +90,25 @@ SRCS+= blake3.c \
blake3_generic.c \
blake3_impl.c
+.if ${MACHINE_ARCH} == "aarch64"
#icp/asm-aarch64/blake3
SRCS+= b3_aarch64_sse2.S \
b3_aarch64_sse41.S
+.endif
+.if ${MACHINE_ARCH} == "powerpc64le"
#icp/asm-ppc64/blake3
SRCS+= b3_ppc64le_sse2.S \
b3_ppc64le_sse41.S
+.endif
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
#icp/asm-x86_64/blake3
SRCS+= blake3_avx2.S \
blake3_avx512.S \
blake3_sse2.S \
blake3_sse41.S
+.endif
#icp/algs/edonr
SRCS+= edonr.c
@@ -112,23 +118,31 @@ SRCS+= sha256_impl.c \
sha2_generic.c \
sha512_impl.c
+.if ${MACHINE_ARCH} == "armv7"
#icp/asm-arm/sha2
SRCS+= sha256-armv7.S \
sha512-armv7.S
+.endif
+.if ${MACHINE_ARCH} == "aarch64"
#icp/asm-aarch64/sha2
SRCS+= sha256-armv8.S \
sha512-armv8.S
+.endif
+.if ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc64le"
#icp/asm-ppc64/sha2
SRCS+= sha256-p8.S \
sha256-ppc.S \
sha512-p8.S \
sha512-ppc.S
+.endif
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
#icp/asm-x86_64/sha2
SRCS+= sha256-x86_64.S \
sha512-x86_64.S
+.endif
#lua
SRCS+= lapi.c \
@@ -506,7 +520,7 @@ CFLAGS.zstd_opt.c= -U__BMI__ -fno-tree-vectorize ${NO_
CFLAGS.zstd_ldm.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
CFLAGS.zstd_opt.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-.if ${MACHINE_CPUARCH} == "aarch64"
+.if ${MACHINE_ARCH} == "aarch64"
__ZFS_ZSTD_AARCH64_FLAGS= -include ${SRCDIR}/zstd/include/aarch64_compat.h
CFLAGS.zstd.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
CFLAGS.entropy_common.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}