Thu Apr 11 19:54:42 2024 UTC (45d)
fix typo in comment


(tnn)
diff -r1.168 -r1.169 pkgsrc/lang/rust/distinfo
diff -r1.13 -r1.14 pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
cvs diff -r1.168 -r1.169 pkgsrc/lang/rust/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/rust/distinfo 2024/04/11 19:53:50 1.168
+++ pkgsrc/lang/rust/distinfo 2024/04/11 19:54:42 1.169
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.168 2024/04/11 19:53:50 tnn Exp $ 1$NetBSD: distinfo,v 1.169 2024/04/11 19:54:42 tnn Exp $
2 2
3BLAKE2s (rust-1.74.1-aarch64-apple-darwin.tar.gz) = 6cc3cfda101661332815ce9f27781eb73d5b10abead309c0fe3649d428abb2ae 3BLAKE2s (rust-1.74.1-aarch64-apple-darwin.tar.gz) = 6cc3cfda101661332815ce9f27781eb73d5b10abead309c0fe3649d428abb2ae
4SHA512 (rust-1.74.1-aarch64-apple-darwin.tar.gz) = 26b5e2dfead0f48284dc89dde18978285c9d9d4afb310a859d2876aa2abdf1500fb69756b530312c0ceb7da4a309c0319dfa7ea539a800522edd67afd95f7ac2 4SHA512 (rust-1.74.1-aarch64-apple-darwin.tar.gz) = 26b5e2dfead0f48284dc89dde18978285c9d9d4afb310a859d2876aa2abdf1500fb69756b530312c0ceb7da4a309c0319dfa7ea539a800522edd67afd95f7ac2
5Size (rust-1.74.1-aarch64-apple-darwin.tar.gz) = 246818073 bytes 5Size (rust-1.74.1-aarch64-apple-darwin.tar.gz) = 246818073 bytes
6BLAKE2s (rust-1.74.1-aarch64-unknown-linux-gnu.tar.gz) = 90e0e8120826882f13cfa28aacd9065704ae8c2bbf66244ed2ad5ddba1eee401 6BLAKE2s (rust-1.74.1-aarch64-unknown-linux-gnu.tar.gz) = 90e0e8120826882f13cfa28aacd9065704ae8c2bbf66244ed2ad5ddba1eee401
7SHA512 (rust-1.74.1-aarch64-unknown-linux-gnu.tar.gz) = f7c764dbeeb1942a1c30dcdead9a47f7d554459a8c68fb1b626848e92fcdd89909203dd3f313453ca0279dd852962b489574f8ca9f3e92af2fb1ce76519ca8a5 7SHA512 (rust-1.74.1-aarch64-unknown-linux-gnu.tar.gz) = f7c764dbeeb1942a1c30dcdead9a47f7d554459a8c68fb1b626848e92fcdd89909203dd3f313453ca0279dd852962b489574f8ca9f3e92af2fb1ce76519ca8a5
8Size (rust-1.74.1-aarch64-unknown-linux-gnu.tar.gz) = 469441364 bytes 8Size (rust-1.74.1-aarch64-unknown-linux-gnu.tar.gz) = 469441364 bytes
9BLAKE2s (rust-1.74.1-aarch64-unknown-netbsd.tar.xz) = 8b96a419f9612fa96475d1bbca12b67d54a7d40de8c51f80dafd16f8773c0867 9BLAKE2s (rust-1.74.1-aarch64-unknown-netbsd.tar.xz) = 8b96a419f9612fa96475d1bbca12b67d54a7d40de8c51f80dafd16f8773c0867
10SHA512 (rust-1.74.1-aarch64-unknown-netbsd.tar.xz) = 450147e2c82878b1c4c9447e88ee6c8492eb5523d8dda0bc4af188bd41d401dcaeae9019c38edaa6ddb94f6abd2d68f6fa131a238257ced099cb2c30db5c5a62 10SHA512 (rust-1.74.1-aarch64-unknown-netbsd.tar.xz) = 450147e2c82878b1c4c9447e88ee6c8492eb5523d8dda0bc4af188bd41d401dcaeae9019c38edaa6ddb94f6abd2d68f6fa131a238257ced099cb2c30db5c5a62
11Size (rust-1.74.1-aarch64-unknown-netbsd.tar.xz) = 162618788 bytes 11Size (rust-1.74.1-aarch64-unknown-netbsd.tar.xz) = 162618788 bytes
12BLAKE2s (rust-1.74.1-aarch64_be-unknown-netbsd.tar.xz) = f4da7e9a2c2463bf9c2e3cf74b493f89739370a6112f74a809902983c1a4e27e 12BLAKE2s (rust-1.74.1-aarch64_be-unknown-netbsd.tar.xz) = f4da7e9a2c2463bf9c2e3cf74b493f89739370a6112f74a809902983c1a4e27e
13SHA512 (rust-1.74.1-aarch64_be-unknown-netbsd.tar.xz) = c1ca322ee70b89033a2e3ecb9d13e7f20de58459ea75954840994521644281c48a12ebd8dc9f2c711da67ed6ca6685c5038adc85badca3c4b7f8ea6144d7dcc7 13SHA512 (rust-1.74.1-aarch64_be-unknown-netbsd.tar.xz) = c1ca322ee70b89033a2e3ecb9d13e7f20de58459ea75954840994521644281c48a12ebd8dc9f2c711da67ed6ca6685c5038adc85badca3c4b7f8ea6144d7dcc7
14Size (rust-1.74.1-aarch64_be-unknown-netbsd.tar.xz) = 162045860 bytes 14Size (rust-1.74.1-aarch64_be-unknown-netbsd.tar.xz) = 162045860 bytes
@@ -104,27 +104,27 @@ SHA512 (rust-std-1.74.1-x86_64-apple-dar @@ -104,27 +104,27 @@ SHA512 (rust-std-1.74.1-x86_64-apple-dar
104Size (rust-std-1.74.1-x86_64-apple-darwin.tar.gz) = 41966632 bytes 104Size (rust-std-1.74.1-x86_64-apple-darwin.tar.gz) = 41966632 bytes
105BLAKE2s (rust-std-1.74.1-x86_64-unknown-freebsd.tar.gz) = 1b6031eccc673db19748f3efaf0e3cdccb2519f8eacca7bedee0e425511466cb 105BLAKE2s (rust-std-1.74.1-x86_64-unknown-freebsd.tar.gz) = 1b6031eccc673db19748f3efaf0e3cdccb2519f8eacca7bedee0e425511466cb
106SHA512 (rust-std-1.74.1-x86_64-unknown-freebsd.tar.gz) = cf67fa879dcad6f86677559e76eba6c4f824e879268fc50cd778d40b33bcdfc447755981782b95ec91d054752c3f4821c468c1e3eea98257867d0b7bebba3993 106SHA512 (rust-std-1.74.1-x86_64-unknown-freebsd.tar.gz) = cf67fa879dcad6f86677559e76eba6c4f824e879268fc50cd778d40b33bcdfc447755981782b95ec91d054752c3f4821c468c1e3eea98257867d0b7bebba3993
107Size (rust-std-1.74.1-x86_64-unknown-freebsd.tar.gz) = 43726025 bytes 107Size (rust-std-1.74.1-x86_64-unknown-freebsd.tar.gz) = 43726025 bytes
108BLAKE2s (rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.gz) = 693cbd61d9cb455a61b1e35dda8752d763272421c12e3f7806cfdc557bb03a76 108BLAKE2s (rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.gz) = 693cbd61d9cb455a61b1e35dda8752d763272421c12e3f7806cfdc557bb03a76
109SHA512 (rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.gz) = bfed8575c0c010f19536c08179d9ecdbbef77af93dde72c1b8d5f6acd9a7b45f247e3aa3e83c8a0b0ee8ee5817ff15c2775e23a0d6247d8f79a7ede76b3e2d20 109SHA512 (rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.gz) = bfed8575c0c010f19536c08179d9ecdbbef77af93dde72c1b8d5f6acd9a7b45f247e3aa3e83c8a0b0ee8ee5817ff15c2775e23a0d6247d8f79a7ede76b3e2d20
110Size (rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.gz) = 45514745 bytes 110Size (rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.gz) = 45514745 bytes
111BLAKE2s (rust-std-1.74.1-x86_64-unknown-netbsd.tar.xz) = f3452e9f0ddacc651106d82b82f29a57461e47e2dc9295f015f5fc8dff7c5167 111BLAKE2s (rust-std-1.74.1-x86_64-unknown-netbsd.tar.xz) = f3452e9f0ddacc651106d82b82f29a57461e47e2dc9295f015f5fc8dff7c5167
112SHA512 (rust-std-1.74.1-x86_64-unknown-netbsd.tar.xz) = b55e98fa873f57f3063f72bb51dd0b8ade30d30974de7593a5b22e04e16e473b2c9c67993cd880c2fd9cc890193c840fe16798dd225f29c26a6ca84e8155b49d 112SHA512 (rust-std-1.74.1-x86_64-unknown-netbsd.tar.xz) = b55e98fa873f57f3063f72bb51dd0b8ade30d30974de7593a5b22e04e16e473b2c9c67993cd880c2fd9cc890193c840fe16798dd225f29c26a6ca84e8155b49d
113Size (rust-std-1.74.1-x86_64-unknown-netbsd.tar.xz) = 22812280 bytes 113Size (rust-std-1.74.1-x86_64-unknown-netbsd.tar.xz) = 22812280 bytes
114BLAKE2s (rustc-1.75.0-src.tar.gz) = ce73634181497293f543514b5e22b059b9f7b4d102766db8beaa76fd9baf7db4 114BLAKE2s (rustc-1.75.0-src.tar.gz) = ce73634181497293f543514b5e22b059b9f7b4d102766db8beaa76fd9baf7db4
115SHA512 (rustc-1.75.0-src.tar.gz) = c0fbc7349082bdda5693664f86e2814e3a15272dd1b5028859e9d0d864b4375fae94b7039e14567d25bc9c3c4d8187734a163a2522b75cb1f267f7b9e57c3385 115SHA512 (rustc-1.75.0-src.tar.gz) = c0fbc7349082bdda5693664f86e2814e3a15272dd1b5028859e9d0d864b4375fae94b7039e14567d25bc9c3c4d8187734a163a2522b75cb1f267f7b9e57c3385
116Size (rustc-1.75.0-src.tar.gz) = 285857065 bytes 116Size (rustc-1.75.0-src.tar.gz) = 285857065 bytes
117SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = a401c9860c7d4e0f76e1e0616de50a9044382136 117SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = 54dad8ec2e04b72c990d4222c8d73a099b24ad83
118SHA1 (patch-compiler_rustc__llvm_build.rs) = a4a66d449fc9eb99d648d02a041778a68f4f7ce8 118SHA1 (patch-compiler_rustc__llvm_build.rs) = a4a66d449fc9eb99d648d02a041778a68f4f7ce8
119SHA1 (patch-compiler_rustc__target_src_spec_base_netbsd.rs) = 7fb6ec6d45a9bf4525c675390117e9e61b8023cd 119SHA1 (patch-compiler_rustc__target_src_spec_base_netbsd.rs) = 7fb6ec6d45a9bf4525c675390117e9e61b8023cd
120SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = a22b5d28997ed9a5565deec9c34322165d563d00 120SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = a22b5d28997ed9a5565deec9c34322165d563d00
121SHA1 (patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs) = d38c3b43656917e60312a842e6a0c37776bbd5d0 121SHA1 (patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs) = d38c3b43656917e60312a842e6a0c37776bbd5d0
122SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 1ab343595e65ff6348f83cffc30e53d764485ff8 122SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 1ab343595e65ff6348f83cffc30e53d764485ff8
123SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 3b84a462c6bc8245d579452e4c37e3ce13314952 123SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 3b84a462c6bc8245d579452e4c37e3ce13314952
124SHA1 (patch-library_std_src_sys_unix_mod.rs) = f8669d680f169137ac2891af2977909619366a97 124SHA1 (patch-library_std_src_sys_unix_mod.rs) = f8669d680f169137ac2891af2977909619366a97
125SHA1 (patch-library_std_src_sys_unix_thread.rs) = 3f79b21fa033782122e09ffc44de55a0e5ecaecb 125SHA1 (patch-library_std_src_sys_unix_thread.rs) = 3f79b21fa033782122e09ffc44de55a0e5ecaecb
126SHA1 (patch-library_std_src_sys_unix_thread__parking_netbsd.rs) = c29eb1cf074766d34bd2b8c348ce29c6ae2ba163 126SHA1 (patch-library_std_src_sys_unix_thread__parking_netbsd.rs) = c29eb1cf074766d34bd2b8c348ce29c6ae2ba163
127SHA1 (patch-src_bootstrap_bootstrap.py) = 5cd73003292c935ce0e405edd132180233a04857 127SHA1 (patch-src_bootstrap_bootstrap.py) = 5cd73003292c935ce0e405edd132180233a04857
128SHA1 (patch-src_bootstrap_src_core_build__steps_compile.rs) = 4696304623232acd419ad15597f539a10a014271 128SHA1 (patch-src_bootstrap_src_core_build__steps_compile.rs) = 4696304623232acd419ad15597f539a10a014271
129SHA1 (patch-src_bootstrap_src_core_build__steps_llvm.rs) = aba4c50ffd0a037096ea34a5e9660f8b435d997f 129SHA1 (patch-src_bootstrap_src_core_build__steps_llvm.rs) = aba4c50ffd0a037096ea34a5e9660f8b435d997f
130SHA1 (patch-src_bootstrap_src_core_builder.rs) = ec809ca54600aaa805cf8431cbb4a865693e6102 130SHA1 (patch-src_bootstrap_src_core_builder.rs) = ec809ca54600aaa805cf8431cbb4a865693e6102
cvs diff -r1.13 -r1.14 pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs (expand / switch to unified diff)

--- pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs 2024/04/11 19:53:50 1.13
+++ pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs 2024/04/11 19:54:42 1.14
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-compiler_rustc__codegen__ssa_src_back_linker.rs,v 1.13 2024/04/11 19:53:50 tnn Exp $ 1$NetBSD: patch-compiler_rustc__codegen__ssa_src_back_linker.rs,v 1.14 2024/04/11 19:54:42 tnn Exp $
2 2
3Do not use @rpath on Darwin. 3Do not use @rpath on Darwin.
4Find external linunwind on Linux. 4Find external libunwind on Linux.
5 5
6--- compiler/rustc_codegen_ssa/src/back/linker.rs.orig 2023-12-21 16:55:28.000000000 +0000 6--- compiler/rustc_codegen_ssa/src/back/linker.rs.orig 2023-12-21 16:55:28.000000000 +0000
7+++ compiler/rustc_codegen_ssa/src/back/linker.rs 7+++ compiler/rustc_codegen_ssa/src/back/linker.rs
8@@ -329,7 +329,7 @@ impl<'a> GccLinker<'a> { 8@@ -329,7 +329,7 @@ impl<'a> GccLinker<'a> {
9 // principled solution at some point to force the compiler to pass 9 // principled solution at some point to force the compiler to pass
10 // the right `-Wl,-install_name` with an `@rpath` in it. 10 // the right `-Wl,-install_name` with an `@rpath` in it.
11 if self.sess.opts.cg.rpath || self.sess.opts.unstable_opts.osx_rpath_install_name { 11 if self.sess.opts.cg.rpath || self.sess.opts.unstable_opts.osx_rpath_install_name {
12- let mut rpath = OsString::from("@rpath/"); 12- let mut rpath = OsString::from("@rpath/");
13+ let mut rpath = OsString::from("@PREFIX@/lib/"); 13+ let mut rpath = OsString::from("@PREFIX@/lib/");
14 rpath.push(out_filename.file_name().unwrap()); 14 rpath.push(out_filename.file_name().unwrap());
15 self.linker_args(&[OsString::from("-install_name"), rpath]); 15 self.linker_args(&[OsString::from("-install_name"), rpath]);
16 } 16 }
17@@ -455,6 +455,10 @@ impl<'a> Linker for GccLinker<'a> { 17@@ -455,6 +455,10 @@ impl<'a> Linker for GccLinker<'a> {