CVS commit: pkgsrc/lang/rust

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Nov 25 14:37:35 UTC 2024

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

Log Message:
rust: fix mismerged patch (Linux)


To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 pkgsrc/lang/rust/distinfo
cvs rdiff -u -r1.18 -r1.19 \
    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/distinfo
diff -u pkgsrc/lang/rust/distinfo:1.176 pkgsrc/lang/rust/distinfo:1.177
--- pkgsrc/lang/rust/distinfo:1.176     Sun Nov 24 16:13:42 2024
+++ pkgsrc/lang/rust/distinfo   Mon Nov 25 14:37:35 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.176 2024/11/24 16:13:42 he Exp $
+$NetBSD: distinfo,v 1.177 2024/11/25 14:37:35 tnn Exp $
 
 BLAKE2s (rust-1.80.1-aarch64-apple-darwin.tar.gz) = e8552097f84ea7683be3df74148257cbe54765153550e080d7a107086f394e0f
 SHA512 (rust-1.80.1-aarch64-apple-darwin.tar.gz) = 235810513a0020e712d09b4cc881f5bf093fe31c2e83107ddc0aaa3aa25060a99dc18ad9ec4ea94515bde4ddba6341b45b09f9b896a4aa3cf40c332fb8c4a2c9
@@ -108,7 +108,7 @@ Size (rust-std-1.80.1-x86_64-unknown-net
 BLAKE2s (rustc-1.81.0-src.tar.gz) = 5b1c5e436800fbd061df9aee740c8bf73d17654d75016eb84a7e3661e9322957
 SHA512 (rustc-1.81.0-src.tar.gz) = ea1f894b56085ab95ff1bdf9ef20e0756c134be8217c8e8934de44651f7cac6339829a198f8770d97050da79711527ff80fae184038fdb2962b741d0f99b71a1
 Size (rustc-1.81.0-src.tar.gz) = 434198596 bytes
-SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = a11f894d87516da6a8e3faaa4425c8212ff5899f
+SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = f2af6e3b4925e8ca21b7cd783f7831b72700384a
 SHA1 (patch-compiler_rustc__llvm_build.rs) = a4a66d449fc9eb99d648d02a041778a68f4f7ce8
 SHA1 (patch-compiler_rustc__target_src_spec_base_netbsd.rs) = 7d910631f49acf2c33fdd191fd3e0f261efae234
 SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = a22b5d28997ed9a5565deec9c34322165d563d00

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.18 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.18 Sun Nov 24 16:13:43 2024
+++ pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs      Mon Nov 25 14:37:35 2024
@@ -1,9 +1,9 @@
-$NetBSD: patch-compiler_rustc__codegen__ssa_src_back_linker.rs,v 1.18 2024/11/24 16:13:43 he Exp $
+$NetBSD: patch-compiler_rustc__codegen__ssa_src_back_linker.rs,v 1.19 2024/11/25 14:37:35 tnn Exp $
 
 Do not use @rpath on Darwin.
 Find external libunwind on Linux.
 
---- compiler/rustc_codegen_ssa/src/back/linker.rs.orig 2006-07-24 01:21:28.000000000 +0000
+--- compiler/rustc_codegen_ssa/src/back/linker.rs.orig 2024-09-04 15:07:06.000000000 +0000
 +++ compiler/rustc_codegen_ssa/src/back/linker.rs
 @@ -402,7 +402,7 @@ impl<'a> GccLinker<'a> {
              // principled solution at some point to force the compiler to pass
@@ -14,14 +14,14 @@ Find external libunwind on Linux.
                  rpath.push(out_filename.file_name().unwrap());
                  self.link_arg("-install_name").link_arg(rpath);
              }
-@@ -880,6 +880,10 @@ impl<'a> Linker for MsvcLinker<'a> {
+@@ -528,6 +528,10 @@ impl<'a> Linker for GccLinker<'a> {
+     }
  
-     fn link_dylib_by_name(&mut self, name: &str, verbatim: bool, _as_needed: bool) {
-         self.link_arg(format!("{}{}", name, if verbatim { "" } else { ".lib" }));
+     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("-L@PREFIX@/lib");
 +        }
-     }
- 
-     fn link_dylib_by_path(&mut self, path: &Path, _as_needed: bool) {
+         if self.sess.target.os == "illumos" && name == "c" {
+             // libc will be added via late_link_args on illumos so that it will
+             // appear last in the library search order.