rust184: Restore $ORIGIN rpath fix.

[Jonathan Perkin (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jonathan Perkin <jperkin%smartos.org@localhost>
Pushed By:	jperkin
Date:		Tue Feb 4 17:14:10 2025 +0000
Changeset:	57dc3128d3b3a1bac68d83eca4cb3ed211b534d4

Modified Files:
	rust184/distinfo
	rust184/patches/patch-src_bootstrap_src_core_builder_cargo.rs

Log Message:
rust184: Restore $ORIGIN rpath fix.

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

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

diffstat:
 rust184/distinfo                                              |  2 +-
 rust184/patches/patch-src_bootstrap_src_core_builder_cargo.rs | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diffs:
diff --git a/rust184/distinfo b/rust184/distinfo
index 8553f5c68d..db2845ceb7 100644
--- a/rust184/distinfo
+++ b/rust184/distinfo
@@ -124,8 +124,8 @@ SHA1 (patch-library_stdarch_crates_std__detect_tests_cpu-detection.rs) = 97c3ad8
 SHA1 (patch-src_bootstrap_bootstrap.py) = 150a5a7e057de9edbf96f3c387207fda8ba750f9
 SHA1 (patch-src_bootstrap_src_core_build__steps_compile.rs) = e928203ed4734c93cc33c5a3f7879cf18dcecc83
 SHA1 (patch-src_bootstrap_src_core_build__steps_install.rs) = cc6558df42c9c9ac28fdb2ff180bdaa7f22ce816
-SHA1 (patch-src_bootstrap_src_core_builder_cargo.rs) = 8aa36577fffd8d02cdd72151f42f5b1c971f2be5
 SHA1 (patch-src_bootstrap_src_lib.rs) = d29bc3c0b335d5e788eecbb02fc08966beef0fb1
+SHA1 (patch-src_bootstrap_src_core_builder_cargo.rs) = 2021265bb1370f4d20af5a9878326fc68451de6d
 SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 7abfabb6ec70df229a69355f8c76825610165c37
 SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = e1b2eb2f0b3cf1cf87b443656ae306b3242f6b12
 SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = cb011fc19957883c01725797f7c85ed1b20f96f1
diff --git a/rust184/patches/patch-src_bootstrap_src_core_builder_cargo.rs b/rust184/patches/patch-src_bootstrap_src_core_builder_cargo.rs
index e2c2f4f79b..c9968ac38a 100644
--- a/rust184/patches/patch-src_bootstrap_src_core_builder_cargo.rs
+++ b/rust184/patches/patch-src_bootstrap_src_core_builder_cargo.rs
@@ -7,8 +7,17 @@ Adapt fix to
 https://github.com/rust-lang/rust/issues/133629
 (files restructured upstream)
 
---- src/bootstrap/src/core/builder/cargo.rs.orig	2025-02-02 15:19:31.785846508 +0000
+--- src/bootstrap/src/core/builder/cargo.rs.orig	2025-01-27 23:20:59.000000000 +0000
 +++ src/bootstrap/src/core/builder/cargo.rs
+@@ -238,7 +238,7 @@ impl Cargo {
+                 Some(format!("-Wl,-rpath,@loader_path/../{libdir}"))
+             } else if !target.is_windows() && !target.contains("aix") && !target.contains("xous") {
+                 self.rustflags.arg("-Clink-args=-Wl,-z,origin");
+-                Some(format!("-Wl,-rpath,$ORIGIN/../{libdir}"))
++                Some(format!("-Wl,-rpath,@PREFIX@/lib"))
+             } else {
+                 None
+             };
 @@ -646,7 +646,10 @@ impl Builder<'_> {
                  // Build proc macros both for the host and the target unless proc-macros are not
                  // supported by the target.