diff options
Diffstat (limited to 'debian/patches/d-0001-pkg-config-no-special-snowflake.patch')
-rw-r--r-- | debian/patches/d-0001-pkg-config-no-special-snowflake.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/debian/patches/d-0001-pkg-config-no-special-snowflake.patch b/debian/patches/d-0001-pkg-config-no-special-snowflake.patch index 20cb4fd73..9e49580b1 100644 --- a/debian/patches/d-0001-pkg-config-no-special-snowflake.patch +++ b/debian/patches/d-0001-pkg-config-no-special-snowflake.patch @@ -7,11 +7,11 @@ Subject: d-0001-pkg-config-no-special-snowflake vendor/pkg-config/tests/test.rs | 2 -- 2 files changed, 10 insertions(+), 17 deletions(-) -Index: rust/vendor/pkg-config/src/lib.rs -=================================================================== ---- rust.orig/vendor/pkg-config/src/lib.rs -+++ rust/vendor/pkg-config/src/lib.rs -@@ -111,11 +111,8 @@ pub enum Error { +diff --git a/vendor/pkg-config/src/lib.rs b/vendor/pkg-config/src/lib.rs +index e9395be..2f6819c 100644 +--- a/vendor/pkg-config/src/lib.rs ++++ b/vendor/pkg-config/src/lib.rs +@@ -117,11 +117,8 @@ pub enum Error { /// Contains the name of the responsible environment variable. EnvNoPkgConfig(String), @@ -25,7 +25,7 @@ Index: rust/vendor/pkg-config/src/lib.rs CrossCompilation, /// Failed to run `pkg-config`. -@@ -155,14 +152,6 @@ impl fmt::Display for Error { +@@ -161,14 +158,6 @@ impl fmt::Display for Error { fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { match *self { Error::EnvNoPkgConfig(ref name) => write!(f, "Aborted because {} is set", name), @@ -40,7 +40,7 @@ Index: rust/vendor/pkg-config/src/lib.rs Error::Command { ref command, ref cause, -@@ -219,7 +208,7 @@ impl fmt::Display for Error { +@@ -226,7 +215,7 @@ impl fmt::Display for Error { )?; format_output(output, f) } @@ -49,7 +49,7 @@ Index: rust/vendor/pkg-config/src/lib.rs } } } -@@ -411,6 +400,8 @@ impl Config { +@@ -418,6 +407,8 @@ impl Config { if host == target { return true; } @@ -58,7 +58,7 @@ Index: rust/vendor/pkg-config/src/lib.rs // pkg-config may not be aware of cross-compilation, and require // a wrapper script that sets up platform-specific prefixes. -@@ -470,7 +461,11 @@ impl Config { +@@ -477,7 +468,11 @@ impl Config { fn command(&self, name: &str, args: &[&str]) -> Command { let exe = self .targetted_env_var("PKG_CONFIG") @@ -71,11 +71,11 @@ Index: rust/vendor/pkg-config/src/lib.rs let mut cmd = Command::new(exe); if self.is_static(name) { cmd.arg("--static"); -Index: rust/vendor/pkg-config/tests/test.rs -=================================================================== ---- rust.orig/vendor/pkg-config/tests/test.rs -+++ rust/vendor/pkg-config/tests/test.rs -@@ -34,7 +34,6 @@ fn find(name: &str) -> Result<pkg_config +diff --git a/vendor/pkg-config/tests/test.rs b/vendor/pkg-config/tests/test.rs +index 4e04ac0..f884e46 100644 +--- a/vendor/pkg-config/tests/test.rs ++++ b/vendor/pkg-config/tests/test.rs +@@ -34,7 +34,6 @@ fn find(name: &str) -> Result<pkg_config::Library, Error> { pkg_config::probe_library(name) } |