5 files changed, 67 insertions, 0 deletions
diff --git a/lang/rust/files/patch-src_bootstrap_lib.rs b/lang/rust/files/no-hardlinks/patch-src_bootstrap_lib.rs
index 081c2056ad2c..081c2056ad2c 100644
--- a/lang/rust/files/patch-src_bootstrap_lib.rs
+++ b/lang/rust/files/no-hardlinks/patch-src_bootstrap_lib.rs
diff --git a/lang/rust/files/patch-src_bootstrap_native.rs b/lang/rust/files/no-hardlinks/patch-src_bootstrap_native.rs
index 18a334c6b76c..18a334c6b76c 100644
--- a/lang/rust/files/patch-src_bootstrap_native.rs
+++ b/lang/rust/files/no-hardlinks/patch-src_bootstrap_native.rs
diff --git a/lang/rust/files/patch-library_backtrace_src_backtrace_mod.rs b/lang/rust/files/patch-library_backtrace_src_backtrace_mod.rs
new file mode 100644
index 000000000000..3c0a3238824f
--- /dev/null
+++ b/lang/rust/files/patch-library_backtrace_src_backtrace_mod.rs
@@ -0,0 +1,10 @@
+--- library/backtrace/src/backtrace/mod.rs.orig	2021-11-10 18:42:11 UTC
++++ library/backtrace/src/backtrace/mod.rs
+@@ -138,6 +138,7 @@ cfg_if::cfg_if! {
+                 unix,
+                 not(target_os = "emscripten"),
+                 not(all(target_os = "ios", target_arch = "arm")),
++                not(all(target_os = "freebsd", target_arch = "arm")),
+             ),
+             all(
+                 target_env = "sgx",
diff --git a/lang/rust/files/patch-vendor_cc-1.0.69_src_lib.rs b/lang/rust/files/patch-vendor_cc-1.0.69_src_lib.rs
new file mode 100644
index 000000000000..1027757e0c34
--- /dev/null
+++ b/lang/rust/files/patch-vendor_cc-1.0.69_src_lib.rs
@@ -0,0 +1,38 @@
+When the compiler has "clang" in its name the cc crate will pass
+an LLVM target triple to it.  Rust uses a triple that lacks the OS
+version and LLVM will default to FreeBSD 9 behavior, i.e., it will
+default to libstdc++ which is no longer available in newer releases.
+
+To avoid this issue assume we have a GNU compatible toolchain instead
+until LLVM can be updated to use libc++ by default.
+
+https://reviews.llvm.org/D77776
+
+--- vendor/cc-1.0.69/src/lib.rs.orig	2021-03-04 20:58:54 UTC
++++ vendor/cc-1.0.69/src/lib.rs
+@@ -2659,24 +2659,7 @@ impl Tool {
+     }
+ 
+     fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self {
+-        // Try to detect family of the tool from its name, falling back to Gnu.
+-        let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) {
+-            if fname.contains("clang-cl") {
+-                ToolFamily::Msvc { clang_cl: true }
+-            } else if fname.ends_with("cl") || fname == "cl.exe" {
+-                ToolFamily::Msvc { clang_cl: false }
+-            } else if fname.contains("clang") {
+-                match clang_driver {
+-                    Some("cl") => ToolFamily::Msvc { clang_cl: true },
+-                    _ => ToolFamily::Clang,
+-                }
+-            } else {
+-                ToolFamily::Gnu
+-            }
+-        } else {
+-            ToolFamily::Gnu
+-        };
+-
++        let family = ToolFamily::Gnu;
+         Tool {
+             path: path,
+             cc_wrapper_path: None,
diff --git a/lang/rust/files/patch-vendor_openssl-sys_build_main.rs b/lang/rust/files/patch-vendor_openssl-sys_build_main.rs
new file mode 100644
index 000000000000..547703bdc469
--- /dev/null
+++ b/lang/rust/files/patch-vendor_openssl-sys_build_main.rs
@@ -0,0 +1,19 @@
+--- vendor/openssl-sys/build/main.rs.orig	2021-11-29 20:27:34 UTC
++++ vendor/openssl-sys/build/main.rs
+@@ -237,6 +237,7 @@ See rust-openssl README for more information:
+             (3, 3, 0) => ('3', '3', '0'),
+             (3, 3, 1) => ('3', '3', '1'),
+             (3, 3, _) => ('3', '3', 'x'),
++            (3, 4, _) => ('3', '4', 'x'),
+             _ => version_error(),
+         };
+ 
+@@ -279,7 +280,7 @@ fn version_error() -> ! {
+         "
+ 
+ This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5
+-through 3.3.x, but a different version of OpenSSL was found. The build is now aborting
++through 3.4.x, but a different version of OpenSSL was found. The build is now aborting
+ due to this version mismatch.
+ 
+ "