pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

rust18{6,7}: Apply workaround for pkgsrc LLVM on NetBSD/i386 9.x too.



Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%uninett.no@localhost>
Pushed By:	he
Date:		Sun Jun 22 12:29:25 2025 +0200
Changeset:	0a2c86a09021b79ae6ece4d674b603ae06a73a37

Modified Files:
	rust186/options.mk
	rust187/options.mk

Log Message:
rust18{6,7}: Apply workaround for pkgsrc LLVM on NetBSD/i386 9.x too.

Mirrors commit from main pkgsrc.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0a2c86a09021b79ae6ece4d674b603ae06a73a37

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

diffstat:
 rust186/options.mk | 7 ++++---
 rust187/options.mk | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs:
diff --git a/rust186/options.mk b/rust186/options.mk
index ea21b8077e..0124d9a348 100644
--- a/rust186/options.mk
+++ b/rust186/options.mk
@@ -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
diff --git a/rust187/options.mk b/rust187/options.mk
index 1ddbbdc0eb..67921efdaf 100644
--- a/rust187/options.mk
+++ b/rust187/options.mk
@@ -49,13 +49,14 @@ GCC_REQD+=	14
 .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


Home | Main Index | Thread Index | Old Index