CVS commit: pkgsrc/lang/rust

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

Module Name:    pkgsrc
Committed By:   he
Date:           Sun Jun 22 10:19:55 UTC 2025

Modified Files:
        pkgsrc/lang/rust: options.mk

Log Message:
lang/rust: The issue with using pkgsrc LLVM 19 on 9.x extends to i386.

The error message encountered is

error: failed to parse bitcode for LTO module: Invalid alignment value (Producer: 'LLVM19.1.7' Reader: 'LLVM 19.1.7')

as part of the "Building stage1 library artifacts (i586-unknown-netbsd)"
phase of the rust compiler build.

Bumping GCC_REQD to >= 10 works around this (undiagnosed) problem.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/lang/rust/options.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/rust/options.mk
diff -u pkgsrc/lang/rust/options.mk:1.47 pkgsrc/lang/rust/options.mk:1.48
--- pkgsrc/lang/rust/options.mk:1.47    Sat Jun 21 14:53:02 2025
+++ pkgsrc/lang/rust/options.mk Sun Jun 22 10:19:55 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.47 2025/06/21 14:53:02 he Exp $
+# $NetBSD: options.mk,v 1.48 2025/06/22 10:19:55 he Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.rust
 PKG_SUPPORTED_OPTIONS+=        rust-cargo-static rust-docs
@@ -41,13 +41,14 @@ GCC_REQD+=  12
 .endif
 
 # Apparently, using pkgsrc LLVM 19.x does not work on
-# NetBSD/x86_64 9.x unless rust is built with a newer
-# gcc than the platform-included 7.5.0.  Ref.
+# NetBSD/x86_64 9.x and NetBSD/i386 9.x unless rust is built
+# with a newer gcc than the platform-included 7.5.0.  Ref.
 # https://gnats.netbsd.org/59435 and
 # https://mail-index.netbsd.org/pkgsrc-users/2025/05/20/msg041603.html
 # and following discussion.
 .if empty(PKG_OPTIONS:Mrust-internal-llvm)
-.  if ${MACHINE_PLATFORM:MNetBSD-9.*-x86_64}
+.  if ${MACHINE_PLATFORM:MNetBSD-9.*-x86_64} || \
+      ${MACHINE_PLATFORM:MNetBSD-9.*-i386}
 GCC_REQD+=     10
 .  endif
 .endif