CVS commit: pkgsrc/lang/rust

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jan 14 06:44:31 UTC 2026

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

Log Message:
irust: restore v1.8 of patch-src_bootstrap_src_lib.rs

Requested by tnn.


To generate a diff of this commit:
cvs rdiff -u -r1.194 -r1.195 pkgsrc/lang/rust/distinfo
cvs rdiff -u -r1.9 -r1.10 \
    pkgsrc/lang/rust/patches/patch-src_bootstrap_src_lib.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.194 pkgsrc/lang/rust/distinfo:1.195
--- pkgsrc/lang/rust/distinfo:1.194     Tue Jan 13 20:48:23 2026
+++ pkgsrc/lang/rust/distinfo   Wed Jan 14 06:44:31 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.194 2026/01/13 20:48:23 wiz Exp $
+$NetBSD: distinfo,v 1.195 2026/01/14 06:44:31 wiz Exp $
 
 BLAKE2s (rust-1.90.0-aarch64-apple-darwin.tar.gz) = 8d6a1bbf17b2c2891086bf53078bab0125818f20fd433407021e411d1d9fbc76
 SHA512 (rust-1.90.0-aarch64-apple-darwin.tar.gz) = 2d15c22b86aa90f68ae9bea6d699213f661cfa8711189acc036e9969c13877fe3fc55d4ef9c6c08efca81191c272d2e237e53ad28f9fecae666cd1071b7bbded
@@ -118,7 +118,7 @@ SHA1 (patch-src_bootstrap_bootstrap.py) 
 SHA1 (patch-src_bootstrap_src_core_build__steps_compile.rs) = e928203ed4734c93cc33c5a3f7879cf18dcecc83
 SHA1 (patch-src_bootstrap_src_core_build__steps_install.rs) = 00ceb941adbdd8fdb96f75dbcc50c2d2b3e55842
 SHA1 (patch-src_bootstrap_src_core_builder_cargo.rs) = b7ce18d045c2ef250817ee4b6ed57e0524d99e71
-SHA1 (patch-src_bootstrap_src_lib.rs) = b90a3b9044c4ad92a7ba50a9e3388f6a91caf9c6
+SHA1 (patch-src_bootstrap_src_lib.rs) = 735a3f6cbb3054200dd55eebce6e9acbd285f51e
 SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 446acdd51fb6ddcba733371263aa2f9949299d31
 SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = e1b2eb2f0b3cf1cf87b443656ae306b3242f6b12
 SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = cb011fc19957883c01725797f7c85ed1b20f96f1

Index: pkgsrc/lang/rust/patches/patch-src_bootstrap_src_lib.rs
diff -u pkgsrc/lang/rust/patches/patch-src_bootstrap_src_lib.rs:1.9 pkgsrc/lang/rust/patches/patch-src_bootstrap_src_lib.rs:1.10
--- pkgsrc/lang/rust/patches/patch-src_bootstrap_src_lib.rs:1.9 Tue Jan 13 20:48:23 2026
+++ pkgsrc/lang/rust/patches/patch-src_bootstrap_src_lib.rs     Wed Jan 14 06:44:31 2026
@@ -1,11 +1,12 @@
-$NetBSD: patch-src_bootstrap_src_lib.rs,v 1.9 2026/01/13 20:48:23 wiz Exp $
+$NetBSD: patch-src_bootstrap_src_lib.rs,v 1.10 2026/01/14 06:44:31 wiz Exp $
 
 Don't filter out optimization flags.
-FreeBSD has a particular C++ runtime library name
+FreeBSD has a particular C++ runtime library name.
+Don't assume files in ${PREFIX}/lib are readable by the building user.
 
---- src/bootstrap/src/lib.rs.orig      2024-01-06 20:52:50.892941220 +0000
+--- src/bootstrap/src/lib.rs.orig      2025-09-14 15:05:11.000000000 +0000
 +++ src/bootstrap/src/lib.rs
-@@ -1209,7 +1209,6 @@ Executed at: {executed_at}"#,
+@@ -1256,7 +1256,6 @@ impl Build {
          base.args()
              .iter()
              .map(|s| s.to_string_lossy().into_owned())
@@ -13,7 +14,7 @@ FreeBSD has a particular C++ runtime lib
              .collect::<Vec<String>>()
      }
  
-@@ -1225,7 +1224,8 @@ Executed at: {executed_at}"#,
+@@ -1272,7 +1271,8 @@ impl Build {
          // If we're compiling C++ on macOS then we add a flag indicating that
          // we want libc++ (more filled out than libstdc++), ensuring that
          // LLVM/etc are all properly compiled.
@@ -23,3 +24,17 @@ FreeBSD has a particular C++ runtime lib
              base.push("-stdlib=libc++".into());
          }
  
+@@ -1813,7 +1813,12 @@ impl Build {
+             // but if that fails just fall back to a slow `copy` operation.
+         } else {
+             if let Err(e) = fs::copy(&src, dst) {
+-                panic!("failed to copy `{}` to `{}`: {}", src.display(), dst.display(), e)
++                if e.kind() == io::ErrorKind::PermissionDenied {
++                    eprintln!("Skipping copy of `{}` to `{}`: {}", src.display(), dst.display(), e);
++                    return;
++                } else {
++                    panic!("failed to copy `{}` to `{}`: {}", src.display(), dst.display(), e)
++                }
+             }
+             t!(fs::set_permissions(dst, metadata.permissions()));
+