CVS commit: pkgsrc/databases/mongodb4

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Sep 24 13:29:45 UTC 2024

Modified Files:
        pkgsrc/databases/mongodb4: Makefile

Log Message:
databases/mongodb4: Narow destructive-interference-size workaround

Previously --param=destructive-interference-size=64 was added on
aarch64 to work around a static assert (somehow related to -mtune and
possible ABI stability), but this is only recognized by newer gcc
(probably >= 12, but definitely 10 does not).

Limit the workaround to aarch64, NetBSD, and 10.99.x for now, making
the package build again on NetBSD 10 aarch64, in theory keeping it
buildable on NetBSD current aarch64.  This removes the workaround for
not-NetBSD aarch64 (but we don't have a report of it being needed).


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/mongodb4/Makefile

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

Modified files:

Index: pkgsrc/databases/mongodb4/Makefile
diff -u pkgsrc/databases/mongodb4/Makefile:1.16 pkgsrc/databases/mongodb4/Makefile:1.17
--- pkgsrc/databases/mongodb4/Makefile:1.16     Tue Sep 10 01:28:35 2024
+++ pkgsrc/databases/mongodb4/Makefile  Tue Sep 24 13:29:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2024/09/10 01:28:35 gdt Exp $
+# $NetBSD: Makefile,v 1.17 2024/09/24 13:29:44 gdt Exp $
 
 DISTNAME=      mongodb-4.4.29
 PKGREVISION=   1
@@ -57,7 +57,15 @@ PYTHON_VERSIONS_INCOMPATIBLE=        27
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "aarch64"
+# On gcc12 as found in NetBSD 10.99.x, on aarch64, there is a static
+# assert related to a c++17 feature about cacheline size.  Adding a
+# param to force the value appears to resolve it.
+# Perhaps, this is for gcc12+ on all arches.
+# On gcc10 as found in NetBSD 10, there is no assert, and the --param
+# flag is unrecognized.
+# \todo File a bug upstream and include the URL
+# \todo Fix this upstream, with a configure test.
+.if ${MACHINE_ARCH} == "aarch64" && ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} > 109900
 CXXFLAGS+=             --param=destructive-interference-size=64
 .endif