pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust: Adjust patches so that they apply without offset.
Module Name: pkgsrc-wip
Committed By: Havard Eidnes <he%NetBSD.org@localhost>
Pushed By: he
Date: Sat Nov 20 12:28:33 2021 +0000
Changeset: fc9468b24008dedefbd7f32c19b82ea8a62460c5
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_llvm-project_llvm_CMakeLists.txt
rust/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
rust/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
rust/patches/patch-src_tools_cargo_tests_testsuite_build.rs
rust/patches/patch-src_tools_rls_rls_src_cmd.rs
rust/patches/patch-src_tools_rls_rls_src_server_io.rs
rust/patches/patch-vendor_cc_src_lib.rs
rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs
rust/patches/patch-vendor_stacker_src_lib.rs
rust/patches/patch-vendor_target-lexicon_src_targets.rs
Log Message:
rust: Adjust patches so that they apply without offset.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fc9468b24008dedefbd7f32c19b82ea8a62460c5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust/distinfo | 38 +++++++++++-----------
rust/patches/patch-compiler_rustc__llvm_build.rs | 4 +--
.../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 | 4 +--
rust/patches/patch-src_bootstrap_compile.rs | 2 +-
.../patch-src_llvm-project_llvm_CMakeLists.txt | 2 +-
...ct_llvm_include_llvm_Analysis_ConstantFolding.h | 2 +-
...llvm-project_llvm_utils_FileCheck_FileCheck.cpp | 2 +-
...atch-src_tools_cargo_src_cargo_core_profiles.rs | 2 +-
.../patch-src_tools_cargo_tests_testsuite_build.rs | 6 ++--
rust/patches/patch-src_tools_rls_rls_src_cmd.rs | 4 +--
.../patch-src_tools_rls_rls_src_server_io.rs | 6 ++--
rust/patches/patch-vendor_cc_src_lib.rs | 2 +-
.../patch-vendor_libc_src_unix_solarish_mod.rs | 2 +-
rust/patches/patch-vendor_stacker_src_lib.rs | 2 +-
.../patch-vendor_target-lexicon_src_targets.rs | 2 +-
20 files changed, 48 insertions(+), 48 deletions(-)
diffs:
diff --git a/rust/distinfo b/rust/distinfo
index 8c458d2b92..2b0c57fe60 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -103,33 +103,33 @@ BLAKE2s (rustc-1.56.1-src.tar.gz) = 73705e205c841547fa3549070c7b76ab70c7c95db121
SHA512 (rustc-1.56.1-src.tar.gz) = 0bd2980ae7cca126c6f045905100550c056a1c1cb91e0b79efab85f3f134f34ee9d286c51328976192799d44ff4323640c828bb984c59b332eaf861feb8ea722
Size (rustc-1.56.1-src.tar.gz) = 179961977 bytes
SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = f8794cc7abaa84804731308b9011fb6b8c143a33
-SHA1 (patch-compiler_rustc__llvm_build.rs) = b5157022f0f1942ae2db1ab78145af1526780b18
+SHA1 (patch-compiler_rustc__llvm_build.rs) = 73f8225f6dea809da9381d78a8099d13c7c151c0
SHA1 (patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = acad7e2b0bbeb85f6453aeee74a0f2ca253d6a9b
SHA1 (patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs) = efae710b37c089702802c3d5aa678d1cc5f88cc2
-SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = 6edc875ba9ffbc1a86b30c679eb1110ba3c6c709
+SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = 8f1b5ced49fa66a646327a19f9eb0501fa2b01c7
SHA1 (patch-compiler_rustc__target_src_spec_netbsd__base.rs) = 18e3cb9f32c4170679459b2c63c856abe0fac6a3
-SHA1 (patch-library_std_src_sys_unix_mod.rs) = 927b03f3f34bd21a81bd2a8b6bcf30fe241e2d32
-SHA1 (patch-library_std_src_sys_unix_thread.rs) = f3af869fba5bc0ab8d28042f55fe830f93b8ef54
-SHA1 (patch-library_unwind_build.rs) = 7ece6de566ead1d9aae490ba91d81ac2d0bc50a8
-SHA1 (patch-src_bootstrap_bootstrap.py) = ca87e6c58f34835b420a63a18ca95605a18657c6
-SHA1 (patch-src_bootstrap_builder.rs) = 80e4919280b26911a78e344af41d53bdf56ef682
-SHA1 (patch-src_bootstrap_compile.rs) = b919c1551494d1cd7cf0e7ef55561ba13d4e5004
+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) = 9f81b91dc8410b6d8a1c1776ce4d431e1c6ba4ab
+SHA1 (patch-src_bootstrap_builder.rs) = 9cb0c695a59c09fbc1c3065ae08954d9dc2aabe5
+SHA1 (patch-src_bootstrap_compile.rs) = c57799aee9c12603f5e6a13cb6b5befc8f96b4b6
SHA1 (patch-src_bootstrap_lib.rs) = f6918e0939b6fe63ae9b524d4c809375149efb15
-SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 23c0f170cf328b3e15bc2c520f5a16af75247ea7
+SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 7abfabb6ec70df229a69355f8c76825610165c37
SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = 67de0d9fc105ef7ea7a0d96fa25fc779c2b89024
SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = cb011fc19957883c01725797f7c85ed1b20f96f1
-SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 977de4b2a9d37f7e7c782f2407c15591e032b6c6
-SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 2675b93a1d636b297a3e1e84b915a15a3da67939
-SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = 3aac5d54a6fe96b9559552e67e497488142d4e80
-SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 10e6c1253adac0262b000aec7636fa0d2ebb666c
-SHA1 (patch-src_tools_rls_rls_src_cmd.rs) = fade3e60fecac5c4e4d4ee5bee82659b4eb385b7
-SHA1 (patch-src_tools_rls_rls_src_server_io.rs) = 51af64526db55abcf6b4b3165df314a16cf62e34
+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_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
SHA1 (patch-src_tools_rust-installer_install-template.sh) = ca769db07986ded26d92957e1055961895def546
-SHA1 (patch-vendor_cc_src_lib.rs) = ade35f1edfd251d9439e3ac3d79bca03b5a7ab9c
-SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 804ea03be546fef0d2bd37d7f8abb26d38a7892b
+SHA1 (patch-vendor_cc_src_lib.rs) = 2f6b0ad800b31cd33334f194651981491ecf7641
+SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 8364e19ea09203d32494c37ff3db19fe3d6b9d8a
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_rustc-ap-rustc__target_src_spec_mod.rs) = 6abed2c934b546f9b92504e3db49f9bd63aa19f8
-SHA1 (patch-vendor_stacker_src_lib.rs) = 2f4db9971c0558ec7034052c810b8c8be80c4ae3
-SHA1 (patch-vendor_target-lexicon_src_targets.rs) = b0ac8638b50c4ff6d159118fd893ef6ded7bba5c
+SHA1 (patch-vendor_stacker_src_lib.rs) = e00a1e95eb16540ff182715db778bf97ebd07a5e
+SHA1 (patch-vendor_target-lexicon_src_targets.rs) = e0c67288516ff8d379d6d1e7b05d4ab86f9ac0a7
diff --git a/rust/patches/patch-compiler_rustc__llvm_build.rs b/rust/patches/patch-compiler_rustc__llvm_build.rs
index 11349b424a..7af182c085 100644
--- a/rust/patches/patch-compiler_rustc__llvm_build.rs
+++ b/rust/patches/patch-compiler_rustc__llvm_build.rs
@@ -2,9 +2,9 @@ $NetBSD$
Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
---- compiler/rustc_llvm/build.rs.orig 2020-11-16 14:01:53.000000000 +0000
+--- compiler/rustc_llvm/build.rs.orig 2021-11-01 07:17:29.000000000 +0000
+++ compiler/rustc_llvm/build.rs
-@@ -284,7 +284,13 @@ fn main() {
+@@ -268,7 +268,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 6589543803..5f107edb65 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
-@@ -697,9 +697,11 @@ supported_targets! {
+@@ -816,9 +816,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 8d968798d2..025b74b7b4 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
-@@ -248,6 +248,7 @@ cfg_if::cfg_if! {
+@@ -269,6 +269,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 c88d599d98..444d257b9b 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
-@@ -333,7 +333,7 @@ pub mod guard {
+@@ -470,7 +470,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 ec416e5d2b..a860d7af9d 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
-@@ -23,7 +23,9 @@ fn main() {
+@@ -20,7 +20,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 4d0522c4cb..9bf3f03b0a 100644
--- a/rust/patches/patch-src_bootstrap_bootstrap.py
+++ b/rust/patches/patch-src_bootstrap_bootstrap.py
@@ -6,7 +6,7 @@ Handle earmv7hf for NetBSD.
--- src/bootstrap/bootstrap.py.orig 2021-02-10 17:36:44.000000000 +0000
+++ src/bootstrap/bootstrap.py
-@@ -229,6 +229,11 @@ def default_build_triple(verbose):
+@@ -236,6 +236,11 @@ def default_build_triple(verbose):
'OpenBSD': 'unknown-openbsd'
}
@@ -18,7 +18,7 @@ Handle earmv7hf for NetBSD.
# Consider the direct transformation first and then the special cases
if ostype in ostype_mapper:
ostype = ostype_mapper[ostype]
-@@ -279,6 +284,7 @@ def default_build_triple(verbose):
+@@ -289,6 +294,7 @@ def default_build_triple(verbose):
cputype_mapper = {
'BePC': 'i686',
'aarch64': 'aarch64',
@@ -26,7 +26,7 @@ Handle earmv7hf for NetBSD.
'amd64': 'x86_64',
'arm64': 'aarch64',
'i386': 'i686',
-@@ -315,10 +321,12 @@ def default_build_triple(verbose):
+@@ -326,10 +332,12 @@ def default_build_triple(verbose):
ostype = 'linux-androideabi'
else:
ostype += 'eabihf'
@@ -40,7 +40,7 @@ Handle earmv7hf for NetBSD.
else:
ostype += 'eabihf'
elif cputype == 'mips':
-@@ -821,7 +829,7 @@ class RustBuild(object):
+@@ -907,7 +915,7 @@ class RustBuild(object):
if "LIBRARY_PATH" in env else ""
# preserve existing RUSTFLAGS
env.setdefault("RUSTFLAGS", "")
diff --git a/rust/patches/patch-src_bootstrap_builder.rs b/rust/patches/patch-src_bootstrap_builder.rs
index 15d469ddc4..afe47c08b9 100644
--- a/rust/patches/patch-src_bootstrap_builder.rs
+++ b/rust/patches/patch-src_bootstrap_builder.rs
@@ -7,7 +7,7 @@ Fix RPATH for pkgsrc.
--- src/bootstrap/builder.rs.orig 2021-09-06 18:42:35.000000000 +0000
+++ src/bootstrap/builder.rs
-@@ -511,7 +511,6 @@ impl<'a> Builder<'a> {
+@@ -520,7 +520,6 @@ impl<'a> Builder<'a> {
install::Clippy,
install::Miri,
install::Analysis,
@@ -15,7 +15,7 @@ Fix RPATH for pkgsrc.
install::Rustc
),
Kind::Run => describe!(run::ExpandYamlAnchors, run::BuildManifest),
-@@ -1148,7 +1147,7 @@ impl<'a> Builder<'a> {
+@@ -1157,7 +1156,7 @@ impl<'a> Builder<'a> {
rustflags.arg("-Zosx-rpath-install-name");
Some("-Wl,-rpath,@loader_path/../lib")
} else if !target.contains("windows") {
diff --git a/rust/patches/patch-src_bootstrap_compile.rs b/rust/patches/patch-src_bootstrap_compile.rs
index fb9d698d6f..6dc2ebbb8a 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
-@@ -394,7 +394,7 @@ fn copy_sanitizers(
+@@ -414,7 +414,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_llvm-project_llvm_CMakeLists.txt b/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt
index 5fa4458f98..2477a555c8 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
-@@ -900,11 +900,6 @@ if(LLVM_TARGET_IS_CROSSCOMPILE_HOST)
+@@ -939,11 +939,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_include_llvm_Analysis_ConstantFolding.h b/rust/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
index 42a14ee2e9..76f1ced1d1 100644
--- a/rust/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
+++ b/rust/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
@@ -4,7 +4,7 @@ Fix SunOS CS conflict not handled by include/llvm-c/DataTypes.h
--- src/llvm-project/llvm/include/llvm/Analysis/ConstantFolding.h.orig 2018-08-01 16:32:37.000000000 +0000
+++ src/llvm-project/llvm/include/llvm/Analysis/ConstantFolding.h
-@@ -20,6 +20,10 @@
+@@ -19,6 +19,10 @@
#ifndef LLVM_ANALYSIS_CONSTANTFOLDING_H
#define LLVM_ANALYSIS_CONSTANTFOLDING_H
diff --git a/rust/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp b/rust/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
index 69f1312485..02c93ff2ec 100644
--- a/rust/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
+++ b/rust/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
@@ -4,7 +4,7 @@ Avoid ambiguous function call.
--- src/llvm-project/llvm/utils/FileCheck/FileCheck.cpp.orig 2019-02-12 15:22:48.000000000 +0000
+++ src/llvm-project/llvm/utils/FileCheck/FileCheck.cpp
-@@ -406,7 +406,7 @@ static void DumpAnnotatedInput(raw_ostre
+@@ -592,7 +592,7 @@ static void DumpAnnotatedInput(raw_ostre
unsigned LineCount = InputFileText.count('\n');
if (InputFileEnd[-1] != '\n')
++LineCount;
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 7262e6fbba..6b677e462c 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
-@@ -458,6 +458,9 @@ impl Profile {
+@@ -720,6 +720,9 @@ impl Profile {
debuginfo: Some(2),
debug_assertions: true,
overflow_checks: true,
diff --git a/rust/patches/patch-src_tools_cargo_tests_testsuite_build.rs b/rust/patches/patch-src_tools_cargo_tests_testsuite_build.rs
index 1770ff452d..7ffba0f965 100644
--- a/rust/patches/patch-src_tools_cargo_tests_testsuite_build.rs
+++ b/rust/patches/patch-src_tools_cargo_tests_testsuite_build.rs
@@ -5,7 +5,7 @@ https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_increment
--- src/tools/cargo/tests/testsuite/build.rs.orig 2019-08-13 06:27:40.000000000 +0000
+++ src/tools/cargo/tests/testsuite/build.rs
-@@ -38,6 +38,7 @@ fn cargo_fail_with_no_stderr() {
+@@ -47,6 +47,7 @@ fn cargo_fail_with_no_stderr() {
/// Checks that the `CARGO_INCREMENTAL` environment variable results in
/// `rustc` getting `-C incremental` passed to it.
@@ -13,7 +13,7 @@ https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_increment
#[cargo_test]
fn cargo_compile_incremental() {
let p = project()
-@@ -60,6 +61,7 @@ fn cargo_compile_incremental() {
+@@ -69,6 +70,7 @@ fn cargo_compile_incremental() {
.run();
}
@@ -21,7 +21,7 @@ https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_increment
#[cargo_test]
fn incremental_profile() {
let p = project()
-@@ -102,6 +104,7 @@ fn incremental_profile() {
+@@ -111,6 +113,7 @@ fn incremental_profile() {
.run();
}
diff --git a/rust/patches/patch-src_tools_rls_rls_src_cmd.rs b/rust/patches/patch-src_tools_rls_rls_src_cmd.rs
index bb99f197b0..4297be2b96 100644
--- a/rust/patches/patch-src_tools_rls_rls_src_cmd.rs
+++ b/rust/patches/patch-src_tools_rls_rls_src_cmd.rs
@@ -5,7 +5,7 @@ Use 32-bit atomic instead of 64-bit; latter may not be available on
--- src/tools/rls/rls/src/cmd.rs.orig 2019-04-10 18:46:16.000000000 +0000
+++ src/tools/rls/rls/src/cmd.rs
-@@ -17,7 +17,7 @@ use crate::config::Config;
+@@ -7,7 +7,7 @@ use crate::config::Config;
use crate::server::{self, LsService, Notification, Request, RequestId};
use rls_analysis::{AnalysisHost, Target};
use rls_vfs::Vfs;
@@ -14,7 +14,7 @@ Use 32-bit atomic instead of 64-bit; latter may not be available on
use lsp_types::{
ClientCapabilities, CodeActionContext, CodeActionParams, CompletionItem,
-@@ -323,8 +323,8 @@ fn url(file_name: &str) -> Url {
+@@ -316,8 +316,8 @@ fn url(file_name: &str) -> Url {
}
fn next_id() -> RequestId {
diff --git a/rust/patches/patch-src_tools_rls_rls_src_server_io.rs b/rust/patches/patch-src_tools_rls_rls_src_server_io.rs
index e2e80ac290..996bc6be27 100644
--- a/rust/patches/patch-src_tools_rls_rls_src_server_io.rs
+++ b/rust/patches/patch-src_tools_rls_rls_src_server_io.rs
@@ -5,7 +5,7 @@ Use 32-bit atomic instead of 64-bit; latter may not be available on
--- src/tools/rls/rls/src/server/io.rs.orig 2019-05-20 12:10:32.000000000 +0000
+++ src/tools/rls/rls/src/server/io.rs
-@@ -7,7 +7,7 @@ use crate::lsp_data::{LSPNotification, L
+@@ -5,7 +5,7 @@ use crate::lsp_data::{LSPNotification, L
use std::fmt;
use std::io::{self, BufRead, Write};
@@ -14,7 +14,7 @@ Use 32-bit atomic instead of 64-bit; latter may not be available on
use std::sync::Arc;
use jsonrpc_core::{self as jsonrpc, response, version, Id};
-@@ -171,13 +171,13 @@ pub trait Output: Sync + Send + Clone +
+@@ -169,13 +169,13 @@ pub trait Output: Sync + Send + Clone +
/// An output that sends notifications and responses on `stdout`.
#[derive(Clone)]
pub(super) struct StdioOutput {
@@ -30,7 +30,7 @@ Use 32-bit atomic instead of 64-bit; latter may not be available on
}
}
-@@ -194,7 +194,7 @@ impl Output for StdioOutput {
+@@ -192,7 +192,7 @@ impl Output for StdioOutput {
}
fn provide_id(&self) -> RequestId {
diff --git a/rust/patches/patch-vendor_cc_src_lib.rs b/rust/patches/patch-vendor_cc_src_lib.rs
index 0e48f63b33..d786cb3f52 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
-@@ -2378,6 +2378,7 @@ impl Build {
+@@ -2382,6 +2382,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_solarish_mod.rs b/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs
index 3ae0e9e640..bcf64dadb2 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
-@@ -981,6 +981,8 @@ pub const EOWNERDEAD: ::c_int = 58;
+@@ -1215,6 +1215,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_stacker_src_lib.rs b/rust/patches/patch-vendor_stacker_src_lib.rs
index c875d3bffc..dfd1589f54 100644
--- a/rust/patches/patch-vendor_stacker_src_lib.rs
+++ b/rust/patches/patch-vendor_stacker_src_lib.rs
@@ -4,7 +4,7 @@ Avoid missing pthread_* on older SunOS.
--- vendor/stacker/src/lib.rs.orig 2020-07-13 18:18:17.000000000 +0000
+++ vendor/stacker/src/lib.rs
-@@ -355,7 +355,7 @@ cfg_if! {
+@@ -407,7 +407,7 @@ cfg_if! {
);
Some(mi.assume_init().AllocationBase as usize + get_thread_stack_guarantee() + 0x1000)
}
diff --git a/rust/patches/patch-vendor_target-lexicon_src_targets.rs b/rust/patches/patch-vendor_target-lexicon_src_targets.rs
index 655148fb0f..323e0d4773 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
-@@ -1277,6 +1277,7 @@ mod tests {
+@@ -1287,6 +1287,7 @@ mod tests {
"aarch64-unknown-linux-gnu_ilp32",
"aarch64-unknown-linux-musl",
"aarch64-unknown-netbsd",
Home |
Main Index |
Thread Index |
Old Index