CVS commit: pkgsrc/lang/rust

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Aug  5 12:38:56 UTC 2025

Modified Files:
        pkgsrc/lang/rust: Makefile distinfo
        pkgsrc/lang/rust/patches:
            patch-compiler_rustc__codegen__ssa_src_back_linker.rs

Log Message:
rust: fix linux rpath issue

https://mail-index.netbsd.org/pkgsrc-users/2025/08/04/msg041822.html


To generate a diff of this commit:
cvs rdiff -u -r1.341 -r1.342 pkgsrc/lang/rust/Makefile
cvs rdiff -u -r1.184 -r1.185 pkgsrc/lang/rust/distinfo
cvs rdiff -u -r1.19 -r1.20 \
    pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs

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.341 pkgsrc/lang/rust/Makefile:1.342
--- pkgsrc/lang/rust/Makefile:1.341     Wed Jul 16 22:06:25 2025
+++ pkgsrc/lang/rust/Makefile   Tue Aug  5 12:38:56 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.341 2025/07/16 22:06:25 he Exp $
+# $NetBSD: Makefile,v 1.342 2025/08/05 12:38:56 tnn Exp $
 
 DISTNAME=      rustc-1.86.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  https://static.rust-lang.org/dist/
 

Index: pkgsrc/lang/rust/distinfo
diff -u pkgsrc/lang/rust/distinfo:1.184 pkgsrc/lang/rust/distinfo:1.185
--- pkgsrc/lang/rust/distinfo:1.184     Tue Jun 17 13:01:57 2025
+++ pkgsrc/lang/rust/distinfo   Tue Aug  5 12:38:56 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.184 2025/06/17 13:01:57 jperkin Exp $
+$NetBSD: distinfo,v 1.185 2025/08/05 12:38:56 tnn Exp $
 
 BLAKE2s (rust-1.85.1-aarch64-apple-darwin.tar.gz) = d78359b32fe92855663ee77baf041b4f40eedbe954f9f857763ed4624633837f
 SHA512 (rust-1.85.1-aarch64-apple-darwin.tar.gz) = a61d0b08ed7c9c319d192b0ee171a641ca3f24e3f2c785957f02b5a429562de9726b8178bdb4e6d225e853ecdfa10b555e4795e79ca51d980cdca8353ec99f13
@@ -108,7 +108,7 @@ Size (rust-std-1.85.1-x86_64-unknown-net
 BLAKE2s (rustc-1.86.0-src.tar.gz) = 6ea2f28beb6e328dd0321a83fb74680521008250a8100300f748ad0c5f5eb914
 SHA512 (rustc-1.86.0-src.tar.gz) = 68e866f527d8bb6338a0bd2f63b28904ab8e05dcd89c71f2564625ef91deb608f6d21dce994e1b4206b87d90665adc85fbbfc3bb35bce01e149d5e31437a849f
 Size (rustc-1.86.0-src.tar.gz) = 602542261 bytes
-SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = f2af6e3b4925e8ca21b7cd783f7831b72700384a
+SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = bb4cc16be543116f3f7d981fd8ac349f37dad105
 SHA1 (patch-compiler_rustc__llvm_build.rs) = 3acef995e3038a98b29b31b9bdd43286b1ac29f7
 SHA1 (patch-compiler_rustc__target_src_spec_Targets_sparc64__unknown__netbsd.rs) = 4ad9048594b6c29bfbde9a2b6f33ba8a3bcdfe1f
 SHA1 (patch-compiler_rustc__target_src_spec_base_netbsd.rs) = f6805317abaf61fa5e713af0b3599945a93a751a

Index: pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
diff -u pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs:1.19 pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs:1.20
--- pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs:1.19 Mon Nov 25 14:37:35 2024
+++ pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs      Tue Aug  5 12:38:56 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-compiler_rustc__codegen__ssa_src_back_linker.rs,v 1.19 2024/11/25 14:37:35 tnn Exp $
+$NetBSD: patch-compiler_rustc__codegen__ssa_src_back_linker.rs,v 1.20 2025/08/05 12:38:56 tnn Exp $
 
 Do not use @rpath on Darwin.
 Find external libunwind on Linux.
@@ -19,7 +19,7 @@ Find external libunwind on Linux.
  
      fn link_dylib_by_name(&mut self, name: &str, verbatim: bool, as_needed: bool) {
 +        if self.sess.target.os.contains("linux") && name == "unwind" {
-+            self.link_arg("-rpath,@PREFIX@/lib");
++            self.link_arg("-R@PREFIX@/lib");
 +            self.link_arg("-L@PREFIX@/lib");
 +        }
          if self.sess.target.os == "illumos" && name == "c" {