CVS commit: pkgsrc/lang/rust

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

Module Name:    pkgsrc
Committed By:   he
Date:           Thu Apr 10 20:29:29 UTC 2025

Modified Files:
        pkgsrc/lang/rust: Makefile

Log Message:
lang/rust: re-enable MAKE_ENV and PKGSRC_MAKE_ENV, and improve comment.

These settings are needed to run the bootstrap kits we produce
using pkgsrc, since pkgsrc prevents the use of $ORIGIN in RPATHs.
This makes us able to run the bootstrap rust compiler from within
the build tree, `pwd`/work/rust-bootstrap/bin/rustc, using the
libraries in `pwd`/work/rust-bootstrap/lib/.


To generate a diff of this commit:
cvs rdiff -u -r1.328 -r1.329 pkgsrc/lang/rust/Makefile

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/Makefile
diff -u pkgsrc/lang/rust/Makefile:1.328 pkgsrc/lang/rust/Makefile:1.329
--- pkgsrc/lang/rust/Makefile:1.328     Tue Apr  8 13:31:01 2025
+++ pkgsrc/lang/rust/Makefile   Thu Apr 10 20:29:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.328 2025/04/08 13:31:01 jperkin Exp $
+# $NetBSD: Makefile,v 1.329 2025/04/10 20:29:29 he Exp $
 
 DISTNAME=      rustc-1.85.1-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -57,11 +57,15 @@ CONFIGURE_ARGS+=    --set dist.vendor=false
 # optional from do-cross.mk
 CONFIGURE_ARGS+=       ${ADD_CONFIGURE_ARGS}
 
-# Getting RPATH with $ORIGIN into bootstrap may be troublesome, so
-# uncommenting the LD_LIBRARY_PATH setting may be required to run
-# the bootstrap
-#PKGSRC_MAKE_ENV+=     LD_LIBRARY_PATH=${RUST_BOOTSTRAP_PATH:Q}/lib
-#MAKE_ENV+=            LD_LIBRARY_PATH=${RUST_BOOTSTRAP_PATH:Q}/lib
+# Getting RPATH with $ORIGIN into the bootstrap binaries is
+# problematic, since pkgsrc refuses to put $ORIGIN into RPATHs
+# of executables. So instead we need these so that the bootstrap
+# compiler can be run out of the $RUST_BOOTSTRAP_PATH directory as
+# part of the initial part of the rust compiler build.
+# This problem is not present with the amd64 bootstrap bits,
+# which are built by our upstream and uses $ORIGIN/../lib in RPATH.
+PKGSRC_MAKE_ENV+=      LD_LIBRARY_PATH=${RUST_BOOTSTRAP_PATH:Q}/lib
+MAKE_ENV+=             LD_LIBRARY_PATH=${RUST_BOOTSTRAP_PATH:Q}/lib
 
 # This should allow us to perform "offline" builds (so cargo doesn't fetch
 # dependencies during the build stage) but this isn't hooked up yet.