pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust186: Re-instate LD_LIBRARY_PATH settings.
Module Name: pkgsrc-wip
Committed By: Havard Eidnes <he%NetBSD.org@localhost>
Pushed By: he
Date: Wed Apr 9 17:19:11 2025 +0000
Changeset: ab98e48c027dd1e94d24584d2a5c5bf11b3ce981
Modified Files:
rust186/Makefile
Log Message:
rust186: Re-instate LD_LIBRARY_PATH settings.
This is required to use the bootstrap compilers we build ourselves,
since pkgsrc by default prevents $ORIGIN in RPATH.
The upstream-provided amd64 compiler on the other hand
uses $ORIGIN in RPATH.
Expand on the associated comment so that we might remember why this
is here the next time someone wants to question its presence.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ab98e48c027dd1e94d24584d2a5c5bf11b3ce981
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust186/Makefile | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diffs:
diff --git a/rust186/Makefile b/rust186/Makefile
index e5bcff764a..9541cffd6e 100644
--- a/rust186/Makefile
+++ b/rust186/Makefile
@@ -59,11 +59,13 @@ REPLACE_BASH+= library/portable-simd/subtree-sync.sh
# 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.
+MAKE_ENV+= LD_LIBRARY_PATH=${RUST_BOOTSTRAP_PATH:Q}/lib
+PKGSRC_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.
Home |
Main Index |
Thread Index |
Old Index