From a5cb27bed2202818ee204db23f8488a7794d6ec3 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 4 May 2024 14:41:39 +0200 Subject: Adding debian version 1.70.0+dfsg2-1. Signed-off-by: Daniel Baumann --- debian/patches/d-fix-rustix-outline.patch | 87 +++++-------------------------- 1 file changed, 13 insertions(+), 74 deletions(-) (limited to 'debian/patches/d-fix-rustix-outline.patch') diff --git a/debian/patches/d-fix-rustix-outline.patch b/debian/patches/d-fix-rustix-outline.patch index f141bad58..52e152da1 100644 --- a/debian/patches/d-fix-rustix-outline.patch +++ b/debian/patches/d-fix-rustix-outline.patch @@ -3,38 +3,16 @@ Always enable cc even if the feature is not enabled. Some Debian architectures need outline asm, and Debian does not ship pre-built outline asm. ---- a/vendor/rustix/Cargo.toml -+++ b/vendor/rustix/Cargo.toml -@@ -125,9 +125,9 @@ - [dev-dependencies.tempfile] - version = "3.4.0" - --[build-dependencies.cc] -+[build-dependencies.cc_dep] - version = "1.0.68" --optional = true -+package = "cc" - - [features] - all-apis = [ -@@ -242,6 +242,7 @@ - "Win32_NetworkManagement_IpHelper", - "Win32_System_Threading", - ] -+cc = [] - - [target."cfg(windows)".dev-dependencies.ctor] - version = "0.1.21" ---- a/vendor/rustix/build.rs -+++ b/vendor/rustix/build.rs -@@ -1,5 +1,4 @@ +Index: rust/vendor/rustix/build.rs +=================================================================== +--- rust.orig/vendor/rustix/build.rs ++++ rust/vendor/rustix/build.rs +@@ -1,4 +1,3 @@ -#[cfg(feature = "cc")] --use cc::Build; -+use cc_dep::Build; + use cc::Build; use std::env::var; use std::io::Write; - -@@ -158,16 +157,16 @@ +@@ -158,16 +157,16 @@ fn link_in_librustix_outline(arch: &str, println!("cargo:rerun-if-changed={}", to); // If "cc" is not enabled, use a pre-built library. @@ -54,54 +32,15 @@ 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" +Index: rust/vendor/rustix/Cargo.toml +=================================================================== +--- rust.orig/vendor/rustix/Cargo.toml ++++ rust/vendor/rustix/Cargo.toml +@@ -127,7 +127,6 @@ version = "3.4.0" --[build-dependencies.cc] -+[build-dependencies.cc_dep] + [build-dependencies.cc] 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); -- cgit v1.2.3