CVS commit: pkgsrc/lang/rust

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon May 23 15:13:00 UTC 2022

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

Log Message:
rust: Attempt to unbreak patches.


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 pkgsrc/lang/rust/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/rust/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs \
    pkgsrc/lang/rust/patches/patch-vendor_backtrace_src_symbolize_gimli_elf.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.144 pkgsrc/lang/rust/distinfo:1.145
--- pkgsrc/lang/rust/distinfo:1.144     Wed May 18 20:57:28 2022
+++ pkgsrc/lang/rust/distinfo   Mon May 23 15:13:00 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.144 2022/05/18 20:57:28 he Exp $
+$NetBSD: distinfo,v 1.145 2022/05/23 15:13:00 jperkin Exp $
 
 BLAKE2s (rust-1.58.1-aarch64-apple-darwin.tar.gz) = 7b463dcd407f7281ad6f9418c26f4360685a6d49549165a7b76b41c1a4f39864
 SHA512 (rust-1.58.1-aarch64-apple-darwin.tar.gz) = 66e58a3efe201c1c954bf7f382c8a6a6a52399451ff6e3abd6ad797de32cbc8f01bb92f8512b93bacc2091554afd7de08f7900cfd68bd2e5cf99b68362e26de5
@@ -109,7 +109,7 @@ SHA1 (patch-compiler_rustc__target_src_s
 SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = 8f1b5ced49fa66a646327a19f9eb0501fa2b01c7
 SHA1 (patch-compiler_rustc__target_src_spec_netbsd__base.rs) = 18e3cb9f32c4170679459b2c63c856abe0fac6a3
 SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 94b6bf51fac39d3e28a261855fd747ad1e96b286
-SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = a22d78f12ebb25fe3e549ce86e363acc095635ae
+SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 505192b8fec0cc0a167c27a2121acb3c1acef53c
 SHA1 (patch-library_std_src_sys_unix_mod.rs) = f8669d680f169137ac2891af2977909619366a97
 SHA1 (patch-library_std_src_sys_unix_thread.rs) = e5f661b3dd00058e874fe60cd89d9e919325e99b
 SHA1 (patch-library_unwind_build.rs) = df092d5c07fa0be63a9510f1d6a77e5094ca3b15
@@ -128,7 +128,7 @@ SHA1 (patch-src_tools_rls_rls_src_cmd.rs
 SHA1 (patch-src_tools_rls_rls_src_server_io.rs) = 5236eda97fa686b5661e4e5832102e2f010def7b
 SHA1 (patch-src_tools_rust-installer_install-template.sh) = ca769db07986ded26d92957e1055961895def546
 SHA1 (patch-vendor_backtrace_src_symbolize_gimli.rs) = c5f4217146483389fe664c8cbe70796ca601ab4d
-SHA1 (patch-vendor_backtrace_src_symbolize_gimli_elf.rs) = 9527dd4e72f951f55f31a87bdef803fc5d252b38
+SHA1 (patch-vendor_backtrace_src_symbolize_gimli_elf.rs) = 6ac2ed2694d3afccc3a3475e6d21b8877cf46a02
 SHA1 (patch-vendor_cc_src_lib.rs) = 2f6b0ad800b31cd33334f194651981491ecf7641
 SHA1 (patch-vendor_libc-0.2.108_src_unix_bsd_netbsdlike_netbsd_mod.rs) = a75d2729b96bd8a68c3ecf2e03f2daace737a229
 SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 8364e19ea09203d32494c37ff3db19fe3d6b9d8a

Index: pkgsrc/lang/rust/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs
diff -u pkgsrc/lang/rust/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs:1.1 pkgsrc/lang/rust/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs:1.2
--- pkgsrc/lang/rust/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs:1.1     Wed May 18 20:57:28 2022
+++ pkgsrc/lang/rust/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs Mon May 23 15:13:00 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-library_backtrace_src_symbolize_gimli_elf.rs,v 1.1 2022/05/18 20:57:28 he Exp $
+$NetBSD: patch-library_backtrace_src_symbolize_gimli_elf.rs,v 1.2 2022/05/23 15:13:00 jperkin Exp $
 
 Make NetBSD also find its debug libraries, if present.
 
@@ -10,13 +10,13 @@ Make NetBSD also find its debug librarie
  
 +#[cfg(target_os = "netbsd")]
 +const DEBUG_PATH: &[u8] = b"/usr/libdata/debug";
-+#[cfg(any(target_os = "freebsd", target_os = "linux"))]
++#[cfg(not(target_os = "netbsd"))]
  const DEBUG_PATH: &[u8] = b"/usr/lib/debug";
  
  fn debug_path_exists() -> bool {
      cfg_if::cfg_if! {
 -        if #[cfg(any(target_os = "freebsd", target_os = "linux"))] {
-+        if #[cfg(any(target_os = "freebsd", 
++        if #[cfg(any(target_os = "freebsd",
 +                     target_os = "netbsd",
 +                     target_os = "linux"))] {
              use core::sync::atomic::{AtomicU8, Ordering};
Index: pkgsrc/lang/rust/patches/patch-vendor_backtrace_src_symbolize_gimli_elf.rs
diff -u pkgsrc/lang/rust/patches/patch-vendor_backtrace_src_symbolize_gimli_elf.rs:1.1 pkgsrc/lang/rust/patches/patch-vendor_backtrace_src_symbolize_gimli_elf.rs:1.2
--- pkgsrc/lang/rust/patches/patch-vendor_backtrace_src_symbolize_gimli_elf.rs:1.1      Wed May 18 20:57:28 2022
+++ pkgsrc/lang/rust/patches/patch-vendor_backtrace_src_symbolize_gimli_elf.rs  Mon May 23 15:13:00 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-vendor_backtrace_src_symbolize_gimli_elf.rs,v 1.1 2022/05/18 20:57:28 he Exp $
+$NetBSD: patch-vendor_backtrace_src_symbolize_gimli_elf.rs,v 1.2 2022/05/23 15:13:00 jperkin Exp $
 
 Make NetBSD also find its debug libraries, if present.
 
@@ -10,7 +10,7 @@ Make NetBSD also find its debug librarie
  
 +#[cfg(target_os = "netbsd")]
 +const DEBUG_PATH: &[u8] = b"/usr/libdata/debug";
-+#[cfg(any(target_os = "freebsd", target_os = "linux"))]
++#[cfg(not(target_os = "netbsd"))]
  const DEBUG_PATH: &[u8] = b"/usr/lib/debug";
  
  fn debug_path_exists() -> bool {