rustix: also patch second vendored copy

else this exposes a racy bug potentially breaking the arch:all build.

Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>

diff --git a/debian/patches/d-fix-rustix-outline.patch b/debian/patches/d-fix-rustix-outline.patch
index 324f880a372d3c4ea02a67cc113840884a505c5d..f141bad58b13735e5185c038d5a495104a9d861e 100644 (file)
--- a/debian/patches/d-fix-rustix-outline.patch
+++ b/debian/patches/d-fix-rustix-outline.patch
@@ -54,3 +54,54 @@ outline asm.
      {
          let out_dir = var("OUT_DIR").unwrap();
          // Add `-gdwarf-3` so that we always get the same output, regardless of
+--- a/vendor/rustix-0.36.5/Cargo.toml
++++ b/vendor/rustix-0.36.5/Cargo.toml
+@@ -116,9 +116,9 @@
+ [dev-dependencies.tempfile]
+ version = "3.2.0"
+ 
+-[build-dependencies.cc]
++[build-dependencies.cc_dep]
+ version = "1.0.68"
+-optional = true
++package = "cc"
+ 
+ [features]
+ all-apis = [
+@@ -231,6 +231,7 @@
+     "Win32_NetworkManagement_IpHelper",
+     "Win32_System_Threading",
+ ]
++cc = []
+ 
+ [target."cfg(windows)".dev-dependencies.ctor]
+ version = "0.1.21"
+--- a/vendor/rustix-0.36.5/build.rs
++++ b/vendor/rustix-0.36.5/build.rs
+@@ -1,5 +1,4 @@
+-#[cfg(feature = "cc")]
+-use cc::Build;
++use cc_dep::Build;
+ use std::env::var;
+ use std::io::Write;
+ 
+@@ -118,16 +117,16 @@
+     println!("cargo:rerun-if-changed={}", to);
+ 
+     // If "cc" is not enabled, use a pre-built library.
+-    #[cfg(not(feature = "cc"))]
++    /*#[cfg(not(feature = "cc"))]
+     {
+         let _ = asm_name;
+         println!("cargo:rustc-link-search={}/{}", OUTLINE_PATH, profile);
+         println!("cargo:rustc-link-lib=static={}", name);
+-    }
++    }*/
+ 
+     // If "cc" is enabled, build the library from source, update the pre-built
+     // version, and assert that the pre-built version is checked in.
+-    #[cfg(feature = "cc")]
++    //#[cfg(feature = "cc")]
+     {
+         let out_dir = var("OUT_DIR").unwrap();
+         Build::new().file(&asm_name).compile(&name);