* 0001-nfc-Fix-missing-include.patch was only used in 1.51.0 version recently removed * 0001-rustc_target-Fix-dash-vs-underscore-mismatches-in-op.patch was only used in 1.49.0 version in meta-rust
Signed-off-by: Martin Jansa <martin.ja...@gmail.com> --- .../0001-nfc-Fix-missing-include.patch | 26 ------- ...-dash-vs-underscore-mismatches-in-op.patch | 75 ------------------- 2 files changed, 101 deletions(-) delete mode 100644 meta/recipes-devtools/rust/rust-llvm/0001-nfc-Fix-missing-include.patch delete mode 100644 meta/recipes-devtools/rust/rust/0001-rustc_target-Fix-dash-vs-underscore-mismatches-in-op.patch diff --git a/meta/recipes-devtools/rust/rust-llvm/0001-nfc-Fix-missing-include.patch b/meta/recipes-devtools/rust/rust-llvm/0001-nfc-Fix-missing-include.patch deleted file mode 100644 index f6dee77ab2..0000000000 --- a/meta/recipes-devtools/rust/rust-llvm/0001-nfc-Fix-missing-include.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3b7e611bd58ba842470d17374c550e14bceca5c7 Mon Sep 17 00:00:00 2001 -From: serge-sans-paille <sguel...@redhat.com> -Date: Tue, 10 Nov 2020 14:55:25 +0100 -Subject: [PATCH] [nfc] Fix missing include - -Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/b498303066a63a203d24f739b2d2e0e56dca70d1] -Signed-off-by: Khem Raj <raj.k...@gmail.com> ---- - llvm/utils/benchmark/src/benchmark_register.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/llvm/utils/benchmark/src/benchmark_register.h b/llvm/utils/benchmark/src/benchmark_register.h -index 0705e219f2fa..4caa5ad4da07 100644 ---- a/llvm/utils/benchmark/src/benchmark_register.h -+++ b/llvm/utils/benchmark/src/benchmark_register.h -@@ -1,6 +1,7 @@ - #ifndef BENCHMARK_REGISTER_H - #define BENCHMARK_REGISTER_H - -+#include <limits> - #include <vector> - - #include "check.h" --- -2.30.1 - diff --git a/meta/recipes-devtools/rust/rust/0001-rustc_target-Fix-dash-vs-underscore-mismatches-in-op.patch b/meta/recipes-devtools/rust/rust/0001-rustc_target-Fix-dash-vs-underscore-mismatches-in-op.patch deleted file mode 100644 index 13d81eaa37..0000000000 --- a/meta/recipes-devtools/rust/rust/0001-rustc_target-Fix-dash-vs-underscore-mismatches-in-op.patch +++ /dev/null @@ -1,75 +0,0 @@ -From dd682cb48c8b667859dded98a4bbfbd891a1eca4 Mon Sep 17 00:00:00 2001 -From: Vadim Petrochenkov <vadim.petrochen...@gmail.com> -Date: Thu, 12 Nov 2020 19:16:59 +0300 -Subject: [PATCH] rustc_target: Fix dash vs underscore mismatches in option - names - ---- - compiler/rustc_target/src/spec/mod.rs | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs -index f949bf95a50..f837114ee74 100644 ---- a/compiler/rustc_target/src/spec/mod.rs -+++ b/compiler/rustc_target/src/spec/mod.rs -@@ -1428,8 +1428,8 @@ pub fn from_json(obj: Json) -> Result<Target, String> { - } - - key!(is_builtin, bool); -- key!(endian = "target_endian"); -- key!(c_int_width = "target_c_int_width"); -+ key!(endian = "target-endian"); -+ key!(c_int_width = "target-c-int-width"); - key!(os); - key!(env); - key!(vendor); -@@ -1466,7 +1466,7 @@ pub fn from_json(obj: Json) -> Result<Target, String> { - key!(exe_suffix); - key!(staticlib_prefix); - key!(staticlib_suffix); -- key!(os_family = "target_family", optional); -+ key!(os_family = "target-family", optional); - key!(abi_return_struct_as_int, bool); - key!(is_like_osx, bool); - key!(is_like_solaris, bool); -@@ -1511,7 +1511,7 @@ pub fn from_json(obj: Json) -> Result<Target, String> { - key!(limit_rdylib_exports, bool); - key!(override_export_symbols, opt_list); - key!(merge_functions, MergeFunctions)?; -- key!(mcount = "target_mcount"); -+ key!(mcount = "target-mcount"); - key!(llvm_abiname); - key!(relax_elf_relocations, bool); - key!(llvm_args, list); -@@ -1663,8 +1663,8 @@ fn to_json(&self) -> Json { - target_val!(data_layout); - - target_option_val!(is_builtin); -- target_option_val!(endian, "target_endian"); -- target_option_val!(c_int_width, "target_c_int_width"); -+ target_option_val!(endian, "target-endian"); -+ target_option_val!(c_int_width, "target-c-int-width"); - target_option_val!(os); - target_option_val!(env); - target_option_val!(vendor); -@@ -1701,7 +1701,7 @@ fn to_json(&self) -> Json { - target_option_val!(exe_suffix); - target_option_val!(staticlib_prefix); - target_option_val!(staticlib_suffix); -- target_option_val!(os_family, "target_family"); -+ target_option_val!(os_family, "target-family"); - target_option_val!(abi_return_struct_as_int); - target_option_val!(is_like_osx); - target_option_val!(is_like_solaris); -@@ -1746,7 +1746,7 @@ fn to_json(&self) -> Json { - target_option_val!(limit_rdylib_exports); - target_option_val!(override_export_symbols); - target_option_val!(merge_functions); -- target_option_val!(mcount, "target_mcount"); -+ target_option_val!(mcount, "target-mcount"); - target_option_val!(llvm_abiname); - target_option_val!(relax_elf_relocations); - target_option_val!(llvm_args); --- -2.28.0 - -- 2.32.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155617): https://lists.openembedded.org/g/openembedded-core/message/155617 Mute This Topic: https://lists.openembedded.org/mt/85322342/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
