CVS commit: pkgsrc/security/openssl

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Sun Jun  1 15:17:52 UTC 2025

Modified Files:
        pkgsrc/security/openssl: Makefile

Log Message:
security/openssl: fix list of 32-bit ports, consolidate with mk/atomic64.mk.

Fixed:
 * 32-bit arm (matches earm*, not equal to "arm")
 * 32-bit mips is either mipsel or mipseb
 * add hppa

OpenSSL will evidently need a fix to build on 32-bit ports, that is
forthcoming.


To generate a diff of this commit:
cvs rdiff -u -r1.306 -r1.307 pkgsrc/security/openssl/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/openssl/Makefile
diff -u pkgsrc/security/openssl/Makefile:1.306 pkgsrc/security/openssl/Makefile:1.307
--- pkgsrc/security/openssl/Makefile:1.306      Tue May  6 12:07:36 2025
+++ pkgsrc/security/openssl/Makefile    Sun Jun  1 15:17:52 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.306 2025/05/06 12:07:36 wiz Exp $
+# $NetBSD: Makefile,v 1.307 2025/06/01 15:17:52 he Exp $
 
 # Remember to upload-distfiles when updating OpenSSL -- otherwise it
 # is not possible for users who have bootstrapped without OpenSSL
@@ -32,17 +32,18 @@ MAKE_FLAGS+=                MANDIR=${PREFIX}/${PKGMAND
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD" && \
-       ((${MACHINE_ARCH} == "arm") || \
-       (${MACHINE_ARCH} == "hppa") || \
+       ((${MACHINE_ARCH} == "hppa") || \
        (${MACHINE_ARCH} == "i386") || \
        (${MACHINE_ARCH} == "m68k") || \
-       (${MACHINE_ARCH} == "mips") || \
+       (${MACHINE_ARCH} == "mipsel") || \
+       (${MACHINE_ARCH} == "mipseb") || \
        (${MACHINE_ARCH} == "powerpc") || \
        (${MACHINE_ARCH} == "riscv32") || \
        (${MACHINE_ARCH} == "sh3eb") || \
        (${MACHINE_ARCH} == "sh3el") || \
        (${MACHINE_ARCH} == "sparc") || \
-       (${MACHINE_ARCH} == "vax"))
+       (${MACHINE_ARCH} == "vax") || \
+       !empty(MACHINE_ARCH:Mearm*))
 # Use OpenSSL's built-in fallbacks (not actually clang-specific)
 # see src/crypto/external/bsd/openssl/lib/libcrypto/arch/*/crypto.inc
 CFLAGS+=               -DBROKEN_CLANG_ATOMICS  # no atomic 64 bit ops