pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

rust: rename a patch so it is picked up, and fix it...



Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Thu Jul 14 11:55:22 2022 +0000
Changeset:	14a72f54ecaa42190eee86c1f6ad5c858070d1a4

Modified Files:
	rust/distinfo
Added Files:
	rust/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs
Removed Files:
	rust/patches/patch_library_backtrace_src_symbolize_gimli_elf.rs

Log Message:
rust: rename a patch so it is picked up, and fix it...

Thanks to jperkins@ who alerted me that pkglint was
complaining about a mis-named patch file.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=14a72f54ecaa42190eee86c1f6ad5c858070d1a4

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

diffstat:
 rust/distinfo                                      |  1 +
 ...ch-library_backtrace_src_symbolize_gimli_elf.rs | 24 ++++++++++++++++++++++
 ...ch_library_backtrace_src_symbolize_gimli_elf.rs | 24 ----------------------
 3 files changed, 25 insertions(+), 24 deletions(-)

diffs:
diff --git a/rust/distinfo b/rust/distinfo
index 9665deb114..052bff68b3 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -109,6 +109,7 @@ SHA1 (patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs) = 71b57369
 SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = 8f1b5ced49fa66a646327a19f9eb0501fa2b01c7
 SHA1 (patch-compiler_rustc__target_src_spec_netbsd__base.rs) = 57b26a7eb55a4a8e9ec8c4fb8b3b318a25d5a78b
 SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 32ab8ea3809cd4f6fee9fc0df5db47d76ccbd9d2
+SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 56621c10310914672a851cf5dfbf343a9ff4e1be
 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
diff --git a/rust/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs b/rust/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs
new file mode 100644
index 0000000000..ff9292e2b0
--- /dev/null
+++ b/rust/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Make NetBSD also find its debug libraries, if present.
+
+--- library/backtrace/src/symbolize/gimli/elf.rs.orig	2022-04-04 09:41:26.000000000 +0000
++++ library/backtrace/src/symbolize/gimli/elf.rs
+@@ -276,11 +276,16 @@ fn decompress_zlib(input: &[u8], output:
+     }
+ }
+ 
++#[cfg(target_os = "netbsd")]
++const DEBUG_PATH: &[u8] = b"/usr/libdata/debug";
++#[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", 
++		     target_os = "netbsd",
++                     target_os = "linux"))] {
+             use core::sync::atomic::{AtomicU8, Ordering};
+             static DEBUG_PATH_EXISTS: AtomicU8 = AtomicU8::new(0);
+ 
diff --git a/rust/patches/patch_library_backtrace_src_symbolize_gimli_elf.rs b/rust/patches/patch_library_backtrace_src_symbolize_gimli_elf.rs
deleted file mode 100644
index ec1654df68..0000000000
--- a/rust/patches/patch_library_backtrace_src_symbolize_gimli_elf.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Make NetBSD also find its debug libraries, if present.
-
---- library/backtrace/src/symbolize/gimli/elf.rs.orig	2022-04-04 09:41:26.000000000 +0000
-+++ library/backtrace/src/symbolize/gimli/elf.rs
-@@ -276,11 +276,16 @@ fn decompress_zlib(input: &[u8], output:
-     }
- }
- 
-+#[cfg(target_os = "netbsd")]
-+const DEBUG_PATH: &[u8] = b"/usr/libdata/debug";
-+#[cfg(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", 
-+		     target_os = "netbsd",
-+                     target_os = "linux"))] {
-             use core::sync::atomic::{AtomicU8, Ordering};
-             static DEBUG_PATH_EXISTS: AtomicU8 = AtomicU8::new(0);
- 


Home | Main Index | Thread Index | Old Index