rust183: Restore ORIGIN rpath fix.

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

Module Name:	pkgsrc-wip
Committed By:	Jonathan Perkin <jonathan%perkin.org.uk@localhost>
Pushed By:	jperkin
Date:		Tue Feb 4 15:36:35 2025 +0000
Changeset:	575611bd8b85be8fdf4d8edc61d507f6f0507601

Modified Files:
	rust183/distinfo
	rust183/patches/patch-src_bootstrap_src_core_builder.rs

Log Message:
rust183: 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=575611bd8b85be8fdf4d8edc61d507f6f0507601

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

diffstat:
 rust183/distinfo                                        | 2 +-
 rust183/patches/patch-src_bootstrap_src_core_builder.rs | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diffs:
diff --git a/rust183/distinfo b/rust183/distinfo
index fff6610ea3..b74fbbb02e 100644
--- a/rust183/distinfo
+++ b/rust183/distinfo
@@ -124,7 +124,7 @@ 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.rs) = 5e630630b135541e65c0b7f166ed38570c8cfaf7
+SHA1 (patch-src_bootstrap_src_core_builder.rs) = 55cb8cc21ed5d4c7b297752238d0ee3cf7eb3494
 SHA1 (patch-src_bootstrap_src_lib.rs) = d29bc3c0b335d5e788eecbb02fc08966beef0fb1
 SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 7abfabb6ec70df229a69355f8c76825610165c37
 SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = e1b2eb2f0b3cf1cf87b443656ae306b3242f6b12
diff --git a/rust183/patches/patch-src_bootstrap_src_core_builder.rs b/rust183/patches/patch-src_bootstrap_src_core_builder.rs
index 47c0d2e122..6fc7191af6 100644
--- a/rust183/patches/patch-src_bootstrap_src_core_builder.rs
+++ b/rust183/patches/patch-src_bootstrap_src_core_builder.rs
@@ -40,3 +40,12 @@ which should fix the cross-compile failure.
          Cargo {
              command: cargo,
              compiler,
+@@ -2617,7 +2624,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
+             };