CVS commit: pkgsrc/lang/llvm

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Jun 29 21:10:48 UTC 2025

Modified Files:
        pkgsrc/lang/llvm: Makefile buildlink3.mk version.mk

Log Message:
llvm: use gcc 14 on NetBSD 9

Both base gcc (8) and gcc10 cause llvm to mis-compile lang/wasi-libc,
which is required for a Firefox build. With gcc14, I can successfully
build firefox128.

The GCC_REQD goes into version.mk, so that it also applies to clang
and LLVM-adjacent packages. It is also in buildlink3.mk, or Rust
will fail to build because libLLVM uses a different C++ ABI.

This is not really a fix but a mitigation. It is limited to NetBSD 9,
so there should be no breakage on other platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 pkgsrc/lang/llvm/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/lang/llvm/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/llvm/version.mk

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

Modified files:

Index: pkgsrc/lang/llvm/Makefile
diff -u pkgsrc/lang/llvm/Makefile:1.112 pkgsrc/lang/llvm/Makefile:1.113
--- pkgsrc/lang/llvm/Makefile:1.112     Sat Jun 21 21:38:49 2025
+++ pkgsrc/lang/llvm/Makefile   Sun Jun 29 21:10:47 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2025/06/21 21:38:49 he Exp $
+# $NetBSD: Makefile,v 1.113 2025/06/29 21:10:47 bsiegert Exp $
 #
 # When updating this, please also update:
 # devel/include-what-you-use
@@ -126,12 +126,6 @@ CXXFLAGS+= -mno-pltseq
 .  endif
 .endif
 
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH:Mi386} && ${OS_VERSION:M9.*}
-# Gcc 8 (induced elsewhere) blows up on per-process VM space
-# Ref. https://mail-index.netbsd.org/pkgsrc-users/2025/06/21/msg041678.html
-GCC_REQD+=             10
-.endif
-
 PLIST_SUBST+=  RELEASE_TYPE=${RELEASE_TYPE}
 
 .if ${OPSYS} == "NetBSD"

Index: pkgsrc/lang/llvm/buildlink3.mk
diff -u pkgsrc/lang/llvm/buildlink3.mk:1.30 pkgsrc/lang/llvm/buildlink3.mk:1.31
--- pkgsrc/lang/llvm/buildlink3.mk:1.30 Fri May  9 19:37:09 2025
+++ pkgsrc/lang/llvm/buildlink3.mk      Sun Jun 29 21:10:47 2025
@@ -1,10 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.30 2025/05/09 19:37:09 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2025/06/29 21:10:47 bsiegert Exp $
 
 BUILDLINK_TREE+=       llvm
 
 .if !defined(LLVM_BUILDLINK3_MK)
 LLVM_BUILDLINK3_MK:=
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "NetBSD" && ${OS_VERSION:M9.*}
+# Gcc 8 (induced elsewhere) blows up on per-process VM space.
+# Ref. https://mail-index.netbsd.org/pkgsrc-users/2025/06/21/msg041678.html
+# Also, the llvm produced by gcc 8 or 10 crashes when building wasi-libc.
+GCC_REQD+=             14
+.endif
+
 BUILDLINK_API_DEPENDS.llvm+=   llvm>=19.1.0
 BUILDLINK_ABI_DEPENDS.llvm?=   llvm>=19.1.7
 BUILDLINK_PKGSRCDIR.llvm?=     ../../lang/llvm

Index: pkgsrc/lang/llvm/version.mk
diff -u pkgsrc/lang/llvm/version.mk:1.18 pkgsrc/lang/llvm/version.mk:1.19
--- pkgsrc/lang/llvm/version.mk:1.18    Fri May  9 05:53:52 2025
+++ pkgsrc/lang/llvm/version.mk Sun Jun 29 21:10:48 2025
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.18 2025/05/09 05:53:52 adam Exp $
+# $NetBSD: version.mk,v 1.19 2025/06/29 21:10:48 bsiegert Exp $
 # used by devel/lld
 # used by devel/lldb
 # used by devel/polly
@@ -32,6 +32,15 @@ SITES.${RUNTIMES_DIST}${EXTRACT_SUFX}=       \
                ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
 DISTFILES=     ${DEFAULT_DISTFILES} ${EXTRA_DIST}
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "NetBSD" && ${OS_VERSION:M9.*}
+# Gcc 8 (induced elsewhere) blows up on per-process VM space.
+# Ref. https://mail-index.netbsd.org/pkgsrc-users/2025/06/21/msg041678.html
+# Also, the llvm produced by gcc 8 or 10 crashes when building wasi-libc.
+GCC_REQD+=             14
+.endif
+
+
 .PHONY: llvm-cmake-modules
 post-extract: llvm-cmake-modules
 llvm-cmake-modules: