pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust: reduce line offset in patches by recomputing them.
Module Name: pkgsrc-wip
Committed By: Havard Eidnes <he%NetBSD.org@localhost>
Pushed By: he
Date: Sun Oct 9 16:21:32 2022 +0000
Changeset: cc34607ce307b7e7a31fe9aeb7388bd1db3c294c
Modified Files:
rust/distinfo
rust/patches/patch-compiler_rustc__llvm_build.rs
rust/patches/patch-compiler_rustc__target_src_spec_mod.rs
rust/patches/patch-library_std_src_sys_unix_mod.rs
rust/patches/patch-library_std_src_sys_unix_thread.rs
rust/patches/patch-library_unwind_build.rs
rust/patches/patch-src_bootstrap_bootstrap.py
rust/patches/patch-src_bootstrap_builder.rs
rust/patches/patch-src_bootstrap_compile.rs
rust/patches/patch-src_bootstrap_lib.rs
rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt
rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
rust/patches/patch-vendor_cc_src_lib.rs
rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs
rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs
rust/patches/patch-vendor_target-lexicon_src_targets.rs
Log Message:
rust: reduce line offset in patches by recomputing them.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cc34607ce307b7e7a31fe9aeb7388bd1db3c294c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust/distinfo | 32 +++++++++++-----------
rust/patches/patch-compiler_rustc__llvm_build.rs | 2 +-
.../patch-compiler_rustc__target_src_spec_mod.rs | 2 +-
rust/patches/patch-library_std_src_sys_unix_mod.rs | 2 +-
.../patch-library_std_src_sys_unix_thread.rs | 2 +-
rust/patches/patch-library_unwind_build.rs | 2 +-
rust/patches/patch-src_bootstrap_bootstrap.py | 8 +++---
rust/patches/patch-src_bootstrap_builder.rs | 6 ++--
rust/patches/patch-src_bootstrap_compile.rs | 2 +-
rust/patches/patch-src_bootstrap_lib.rs | 2 +-
.../patch-src_llvm-project_llvm_CMakeLists.txt | 2 +-
...c_llvm-project_llvm_cmake_modules_AddLLVM.cmake | 2 +-
...atch-src_tools_cargo_src_cargo_core_profiles.rs | 2 +-
rust/patches/patch-vendor_cc_src_lib.rs | 2 +-
...ndor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs | 2 +-
.../patch-vendor_libc_src_unix_solarish_mod.rs | 2 +-
.../patch-vendor_target-lexicon_src_targets.rs | 2 +-
17 files changed, 37 insertions(+), 37 deletions(-)
diffs:
diff --git a/rust/distinfo b/rust/distinfo
index 7e60119692..d79030aa6a 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -103,26 +103,26 @@ BLAKE2s (rustc-1.63.0-src.tar.gz) = 0fd32c49a5e919cc01a7f8faefe66132c4462b5a1275
SHA512 (rustc-1.63.0-src.tar.gz) = 8c4ce20f0e6ddf86c13e24f222846dbcddc6b8fccc5490b1c41877df3ecf2543bf5fd88431d2e6d23280f90c0395f0d812b4ad7c13098128b043669660911299
Size (rustc-1.63.0-src.tar.gz) = 203449048 bytes
SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = a9a891b9c507958354fb819587d6d4b31ff83ce6
-SHA1 (patch-compiler_rustc__llvm_build.rs) = 73f8225f6dea809da9381d78a8099d13c7c151c0
+SHA1 (patch-compiler_rustc__llvm_build.rs) = bcc6ed331eebf0589a100d53b29182659596d90b
SHA1 (patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = c81d0d288699056ae45569f8d0a1c9bb08153ec4
SHA1 (patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs) = 71b5736952023931c94c6996e73cdcfc66b429fe
-SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = 8f1b5ced49fa66a646327a19f9eb0501fa2b01c7
+SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = 46d434ec650c4e1ad419cf4c84a0c21d2ae5975a
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
-SHA1 (patch-src_bootstrap_bootstrap.py) = 84af2ffa57ae1b68d12c6b9d3ce181a13576992c
-SHA1 (patch-src_bootstrap_builder.rs) = e17ec4c4fbcac0824f0e45fb60f35c2db842bc6c
-SHA1 (patch-src_bootstrap_compile.rs) = c57799aee9c12603f5e6a13cb6b5befc8f96b4b6
-SHA1 (patch-src_bootstrap_lib.rs) = f6918e0939b6fe63ae9b524d4c809375149efb15
-SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 7abfabb6ec70df229a69355f8c76825610165c37
-SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = 67de0d9fc105ef7ea7a0d96fa25fc779c2b89024
+SHA1 (patch-library_std_src_sys_unix_mod.rs) = ef9e2b2e78602d5779e5d17e979347b0237ea4a6
+SHA1 (patch-library_std_src_sys_unix_thread.rs) = aafa957d5cfa0f48a6e43c20cfa346261ec7aa76
+SHA1 (patch-library_unwind_build.rs) = 7ece6de566ead1d9aae490ba91d81ac2d0bc50a8
+SHA1 (patch-src_bootstrap_bootstrap.py) = acd1839b8381ed39e907652213627e6eb713da48
+SHA1 (patch-src_bootstrap_builder.rs) = ef84496eaeca753200e7a8fc7cf1c460ca3c464c
+SHA1 (patch-src_bootstrap_compile.rs) = 4dfce147e78968b67c5e32edbadf487cea21c613
+SHA1 (patch-src_bootstrap_lib.rs) = 5815a67cbb5b40f652dfe60d1b715e69bdeec1b5
+SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = fb1b9ea0c81bf96abb5a88fcb523631c42cd8f14
+SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = fef9f055d2b918c4480fbf8ee68e259197490a0f
SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = cb011fc19957883c01725797f7c85ed1b20f96f1
SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 26982203916ad601599c7a3e05867e4dad742ae1
SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 2587c2f4d11ad8f75bf8a16de625135b26bacc15
-SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = dc9b405b41882bc7c74e08b8188acab3d4aed4ad
+SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = 88c2f26c5980a3cfacd7a928044dff68eb0ec61e
SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 60713699c968f3e389f486e796009d31a5048906
SHA1 (patch-src_tools_rls_rls_src_cmd.rs) = 8174664b7bce2e60e690bc20ab688606b60c55dc
SHA1 (patch-src_tools_rls_rls_src_server_io.rs) = 5236eda97fa686b5661e4e5832102e2f010def7b
@@ -130,12 +130,12 @@ SHA1 (patch-src_tools_rust-installer_install-template.sh) = ca769db07986ded26d92
SHA1 (patch-vendor_backtrace_src_symbolize_gimli.rs) = b93148ff72a60a17c6a444f2616386c40d872153
SHA1 (patch-vendor_backtrace_src_symbolize_gimli_elf.rs) = 308538090d9ce11d206d6eef0e675581a1fc6e80
SHA1 (patch-vendor_cc-1.0.69_src_lib.rs) = b5c0f795624b928b8b02fe01174e6a24e770adea
-SHA1 (patch-vendor_cc_src_lib.rs) = 2f6b0ad800b31cd33334f194651981491ecf7641
+SHA1 (patch-vendor_cc_src_lib.rs) = 8864edc8dc0ad0665a89c89016bbaee7d603cbe1
SHA1 (patch-vendor_libc-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs) = e447bd34d0dd7c6a51fbc27dfae50129d0b33462
-SHA1 (patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 351e213fc07b0dc7c35d70d6a0c2ecc6b5b9056e
-SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 8364e19ea09203d32494c37ff3db19fe3d6b9d8a
+SHA1 (patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 31b1f5d1c9d289ecbd219b8bb2fd3839db5e7862
+SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 5b45640b2f0015142bd1eda5d5f02c7dbfe9210c
SHA1 (patch-vendor_lzma-sys_config.h) = b654c7e129fa02697734bc87173f89b3056a5437
SHA1 (patch-vendor_openssl-src_src_lib.rs) = e62697daa7e7fa3d7b89f338c3a26066b93d7b34
SHA1 (patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = 4e86aec4c89db9a331950a12f8ec7b8aaa50eed7
SHA1 (patch-vendor_stacker_src_lib.rs) = e00a1e95eb16540ff182715db778bf97ebd07a5e
-SHA1 (patch-vendor_target-lexicon_src_targets.rs) = e0c67288516ff8d379d6d1e7b05d4ab86f9ac0a7
+SHA1 (patch-vendor_target-lexicon_src_targets.rs) = 421aa776a05a64674ffa447b85cfe463075160a2
diff --git a/rust/patches/patch-compiler_rustc__llvm_build.rs b/rust/patches/patch-compiler_rustc__llvm_build.rs
index 7af182c085..aac56c55ef 100644
--- a/rust/patches/patch-compiler_rustc__llvm_build.rs
+++ b/rust/patches/patch-compiler_rustc__llvm_build.rs
@@ -4,7 +4,7 @@ Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
--- compiler/rustc_llvm/build.rs.orig 2021-11-01 07:17:29.000000000 +0000
+++ compiler/rustc_llvm/build.rs
-@@ -268,7 +268,13 @@ fn main() {
+@@ -331,7 +331,13 @@ fn main() {
"c++"
} else if target.contains("netbsd") && llvm_static_stdcpp.is_some() {
// NetBSD uses a separate library when relocation is required
diff --git a/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs b/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs
index 5f107edb65..268837b4b6 100644
--- a/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs
+++ b/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs
@@ -4,7 +4,7 @@ Add i586(pentium) and aarch64_be targets.
--- compiler/rustc_target/src/spec/mod.rs.orig 2021-03-23 16:15:10.000000000 +0000
+++ compiler/rustc_target/src/spec/mod.rs
-@@ -816,9 +816,11 @@ supported_targets! {
+@@ -895,9 +895,11 @@ supported_targets! {
("powerpc-unknown-openbsd", powerpc_unknown_openbsd),
("aarch64-unknown-netbsd", aarch64_unknown_netbsd),
diff --git a/rust/patches/patch-library_std_src_sys_unix_mod.rs b/rust/patches/patch-library_std_src_sys_unix_mod.rs
index 025b74b7b4..1dcc21e31e 100644
--- a/rust/patches/patch-library_std_src_sys_unix_mod.rs
+++ b/rust/patches/patch-library_std_src_sys_unix_mod.rs
@@ -4,7 +4,7 @@ Add libexecinfo for backtrace() on NetBSD.
--- library/std/src/sys/unix/mod.rs.orig 2021-02-10 17:36:44.000000000 +0000
+++ library/std/src/sys/unix/mod.rs
-@@ -269,6 +269,7 @@ cfg_if::cfg_if! {
+@@ -302,6 +302,7 @@ cfg_if::cfg_if! {
#[link(name = "pthread")]
extern "C" {}
} else if #[cfg(target_os = "netbsd")] {
diff --git a/rust/patches/patch-library_std_src_sys_unix_thread.rs b/rust/patches/patch-library_std_src_sys_unix_thread.rs
index 444d257b9b..21a78b44fd 100644
--- a/rust/patches/patch-library_std_src_sys_unix_thread.rs
+++ b/rust/patches/patch-library_std_src_sys_unix_thread.rs
@@ -4,7 +4,7 @@ Fix stack-clash on SunOS.
--- library/std/src/sys/unix/thread.rs.orig 2020-10-07 07:53:22.000000000 +0000
+++ library/std/src/sys/unix/thread.rs
-@@ -470,7 +470,7 @@ pub mod guard {
+@@ -584,7 +584,7 @@ pub mod guard {
let page_size = os::page_size();
PAGE_SIZE.store(page_size, Ordering::Relaxed);
diff --git a/rust/patches/patch-library_unwind_build.rs b/rust/patches/patch-library_unwind_build.rs
index a860d7af9d..ec416e5d2b 100644
--- a/rust/patches/patch-library_unwind_build.rs
+++ b/rust/patches/patch-library_unwind_build.rs
@@ -4,7 +4,7 @@ Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
--- library/unwind/build.rs.orig 2020-10-07 07:53:22.000000000 +0000
+++ library/unwind/build.rs
-@@ -20,7 +20,9 @@ fn main() {
+@@ -23,7 +23,9 @@ fn main() {
} else if target.contains("freebsd") {
println!("cargo:rustc-link-lib=gcc_s");
} else if target.contains("netbsd") {
diff --git a/rust/patches/patch-src_bootstrap_bootstrap.py b/rust/patches/patch-src_bootstrap_bootstrap.py
index a77b009a53..900efdfb40 100644
--- a/rust/patches/patch-src_bootstrap_bootstrap.py
+++ b/rust/patches/patch-src_bootstrap_bootstrap.py
@@ -6,7 +6,7 @@ Default to non-verbose compilation.
--- src/bootstrap/bootstrap.py.orig 2021-02-10 17:36:44.000000000 +0000
+++ src/bootstrap/bootstrap.py
-@@ -218,6 +218,11 @@ def default_build_triple(verbose):
+@@ -278,6 +278,11 @@ def default_build_triple(verbose):
'OpenBSD': 'unknown-openbsd'
}
@@ -18,7 +18,7 @@ Default to non-verbose compilation.
# Consider the direct transformation first and then the special cases
if ostype in ostype_mapper:
ostype = ostype_mapper[ostype]
-@@ -271,6 +276,7 @@ def default_build_triple(verbose):
+@@ -331,6 +336,7 @@ def default_build_triple(verbose):
cputype_mapper = {
'BePC': 'i686',
'aarch64': 'aarch64',
@@ -26,7 +26,7 @@ Default to non-verbose compilation.
'amd64': 'x86_64',
'arm64': 'aarch64',
'i386': 'i686',
-@@ -309,10 +315,12 @@ def default_build_triple(verbose):
+@@ -369,10 +375,12 @@ def default_build_triple(verbose):
ostype = 'linux-androideabi'
else:
ostype += 'eabihf'
@@ -40,7 +40,7 @@ Default to non-verbose compilation.
else:
ostype += 'eabihf'
elif cputype == 'mips':
-@@ -980,7 +988,7 @@ class RustBuild(object):
+@@ -791,7 +799,7 @@ class RustBuild(object):
self.cargo()))
args = [self.cargo(), "build", "--manifest-path",
os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")]
diff --git a/rust/patches/patch-src_bootstrap_builder.rs b/rust/patches/patch-src_bootstrap_builder.rs
index 9e0a9b6567..2a74b87034 100644
--- a/rust/patches/patch-src_bootstrap_builder.rs
+++ b/rust/patches/patch-src_bootstrap_builder.rs
@@ -7,7 +7,7 @@ Pull in upstream commit 5122bb55 to fix install on illumos.
--- src/bootstrap/builder.rs.orig 2022-06-27 13:37:07.000000000 +0000
+++ src/bootstrap/builder.rs
-@@ -659,7 +659,6 @@ impl<'a> Builder<'a> {
+@@ -735,7 +735,6 @@ impl<'a> Builder<'a> {
install::Clippy,
install::Miri,
install::Analysis,
@@ -15,7 +15,7 @@ Pull in upstream commit 5122bb55 to fix install on illumos.
install::Rustc
),
Kind::Run => describe!(run::ExpandYamlAnchors, run::BuildManifest, run::BumpStage0),
-@@ -1370,7 +1369,7 @@ impl<'a> Builder<'a> {
+@@ -1699,7 +1698,7 @@ impl<'a> Builder<'a> {
Some("-Wl,-rpath,@loader_path/../lib")
} else if !target.contains("windows") {
rustflags.arg("-Clink-args=-Wl,-z,origin");
@@ -24,7 +24,7 @@ Pull in upstream commit 5122bb55 to fix install on illumos.
} else {
None
};
-@@ -1433,7 +1432,8 @@ impl<'a> Builder<'a> {
+@@ -1760,7 +1759,8 @@ impl<'a> Builder<'a> {
let needs_unstable_opts = target.contains("linux")
|| target.contains("windows")
|| target.contains("bsd")
diff --git a/rust/patches/patch-src_bootstrap_compile.rs b/rust/patches/patch-src_bootstrap_compile.rs
index 6dc2ebbb8a..c5b279eec4 100644
--- a/rust/patches/patch-src_bootstrap_compile.rs
+++ b/rust/patches/patch-src_bootstrap_compile.rs
@@ -4,7 +4,7 @@ On Darwin, do not use @rpath for internal libraries.
--- src/bootstrap/compile.rs.orig 2021-09-06 18:42:35.000000000 +0000
+++ src/bootstrap/compile.rs
-@@ -414,7 +414,7 @@ fn copy_sanitizers(
+@@ -418,7 +418,7 @@ fn copy_sanitizers(
if target == "x86_64-apple-darwin" || target == "aarch64-apple-darwin" {
// Update the library’s install name to reflect that it has has been renamed.
diff --git a/rust/patches/patch-src_bootstrap_lib.rs b/rust/patches/patch-src_bootstrap_lib.rs
index 5a21ea08f8..efb6bbe2e4 100644
--- a/rust/patches/patch-src_bootstrap_lib.rs
+++ b/rust/patches/patch-src_bootstrap_lib.rs
@@ -5,7 +5,7 @@ FreeBSD has a particular C++ runtime library name
--- src/bootstrap/lib.rs.orig 2021-09-06 18:42:35.000000000 +0000
+++ src/bootstrap/lib.rs
-@@ -954,14 +954,13 @@ impl Build {
+@@ -1050,14 +1050,13 @@ impl Build {
.args()
.iter()
.map(|s| s.to_string_lossy().into_owned())
diff --git a/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt b/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt
index 2477a555c8..bc724c9eb5 100644
--- a/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt
+++ b/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt
@@ -4,7 +4,7 @@ Don't implement sys/regset.h workaround, fix source instead.
--- src/llvm-project/llvm/CMakeLists.txt.orig 2018-03-10 02:51:13.000000000 +0000
+++ src/llvm-project/llvm/CMakeLists.txt
-@@ -939,11 +939,6 @@ if(LLVM_TARGET_IS_CROSSCOMPILE_HOST)
+@@ -1025,11 +1025,6 @@ if(LLVM_TARGET_IS_CROSSCOMPILE_HOST)
# (this is a variable that CrossCompile sets on recursive invocations)
endif()
diff --git a/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake b/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
index 5f0c06e437..3cef007092 100644
--- a/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
+++ b/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
@@ -4,7 +4,7 @@ On Darwin, use correct install-name for shared libraries.
--- src/llvm-project/llvm/cmake/modules/AddLLVM.cmake.orig 2020-09-22 17:14:20.000000000 +0000
+++ src/llvm-project/llvm/cmake/modules/AddLLVM.cmake
-@@ -2117,7 +2117,7 @@ function(llvm_setup_rpath name)
+@@ -2143,7 +2143,7 @@ function(llvm_setup_rpath name)
endif()
if (APPLE)
diff --git a/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs b/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
index 6b677e462c..031a4402c2 100644
--- a/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
+++ b/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
@@ -5,7 +5,7 @@ https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_increment
--- src/tools/cargo/src/cargo/core/profiles.rs.orig 2018-10-24 20:01:28.000000000 +0000
+++ src/tools/cargo/src/cargo/core/profiles.rs
-@@ -720,6 +720,9 @@ impl Profile {
+@@ -643,6 +643,9 @@ impl Profile {
debuginfo: Some(2),
debug_assertions: true,
overflow_checks: true,
diff --git a/rust/patches/patch-vendor_cc_src_lib.rs b/rust/patches/patch-vendor_cc_src_lib.rs
index d786cb3f52..74578676d1 100644
--- a/rust/patches/patch-vendor_cc_src_lib.rs
+++ b/rust/patches/patch-vendor_cc_src_lib.rs
@@ -4,7 +4,7 @@ Add aarch64_eb.
--- vendor/cc/src/lib.rs.orig 2021-07-26 15:20:38.000000000 +0000
+++ vendor/cc/src/lib.rs
-@@ -2382,6 +2382,7 @@ impl Build {
+@@ -2551,6 +2551,7 @@ impl Build {
"aarch64-unknown-linux-gnu" => Some("aarch64-linux-gnu"),
"aarch64-unknown-linux-musl" => Some("aarch64-linux-musl"),
"aarch64-unknown-netbsd" => Some("aarch64--netbsd"),
diff --git a/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs
index cd519f6261..5497db88ad 100644
--- a/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ b/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -4,7 +4,7 @@ Copy execinfo function definitions from openbsd's mod.rs.
--- vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2022-05-10 20:59:35.217463943 +0000
+++ vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs
-@@ -2787,6 +2787,22 @@ extern "C" {
+@@ -2821,6 +2821,22 @@ extern "C" {
pub fn kinfo_getvmmap(pid: ::pid_t, cntp: *mut ::size_t) -> *mut kinfo_vmentry;
}
diff --git a/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs b/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs
index bcf64dadb2..1c0068a94a 100644
--- a/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs
+++ b/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs
@@ -4,7 +4,7 @@ Fix xattr build.
--- vendor/libc/src/unix/solarish/mod.rs.orig 2019-05-20 13:47:24.000000000 +0000
+++ vendor/libc/src/unix/solarish/mod.rs
-@@ -1215,6 +1215,8 @@ pub const EOWNERDEAD: ::c_int = 58;
+@@ -1516,6 +1516,8 @@ pub const EOWNERDEAD: ::c_int = 58;
pub const ENOTRECOVERABLE: ::c_int = 59;
pub const ENOSTR: ::c_int = 60;
pub const ENODATA: ::c_int = 61;
diff --git a/rust/patches/patch-vendor_target-lexicon_src_targets.rs b/rust/patches/patch-vendor_target-lexicon_src_targets.rs
index 323e0d4773..6bfd981fdc 100644
--- a/rust/patches/patch-vendor_target-lexicon_src_targets.rs
+++ b/rust/patches/patch-vendor_target-lexicon_src_targets.rs
@@ -4,7 +4,7 @@ Add aarch64_eb for NetBSD.
--- vendor/target-lexicon/src/targets.rs.orig 2021-05-03 21:35:46.000000000 +0000
+++ vendor/target-lexicon/src/targets.rs
-@@ -1287,6 +1287,7 @@ mod tests {
+@@ -1332,6 +1332,7 @@ mod tests {
"aarch64-unknown-linux-gnu_ilp32",
"aarch64-unknown-linux-musl",
"aarch64-unknown-netbsd",
Home |
Main Index |
Thread Index |
Old Index