From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Sat, 2 Oct 2021 00:08:00 +0000 (+0100)
Subject: d-0001-pkg-config-no-special-snowflake
X-Git-Tag: archive/raspbian/1.81.0+dfsg1-2+rpi1~1^2~31
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b980f7d45e574620aa79a22720741caad9b31792;p=rustc.git

d-0001-pkg-config-no-special-snowflake

Description: always enable cross compilation via pkgconf, and set the right binary name.

Forwarded: not-needed

Gbp-Pq: Topic prune
Gbp-Pq: Name d-0001-pkg-config-no-special-snowflake.patch
---

diff --git a/vendor/pkg-config-0.3.30/src/lib.rs b/vendor/pkg-config-0.3.30/src/lib.rs
index b4254046b0..b880079426 100644
--- a/vendor/pkg-config-0.3.30/src/lib.rs
+++ b/vendor/pkg-config-0.3.30/src/lib.rs
@@ -150,11 +150,8 @@ pub enum Error {
     /// Contains the name of the responsible environment variable.
     EnvNoPkgConfig(String),
 
-    /// Detected cross compilation without a custom sysroot.
-    ///
-    /// Ignore the error with `PKG_CONFIG_ALLOW_CROSS=1`,
-    /// which may let `pkg-config` select libraries
-    /// for the host's architecture instead of the target's.
+    /// Cross compilation detected. Kept for compatibility;
+    /// the Debian package never emits this.
     CrossCompilation,
 
     /// Failed to run `pkg-config`.
@@ -269,14 +266,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),
-            Error::CrossCompilation => f.write_str(
-                "pkg-config has not been configured to support cross-compilation.\n\
-                \n\
-                Install a sysroot for the target platform and configure it via\n\
-                PKG_CONFIG_SYSROOT_DIR and PKG_CONFIG_PATH, or install a\n\
-                cross-compiling wrapper for pkg-config and set it via\n\
-                PKG_CONFIG environment variable.",
-            ),
             Error::Command {
                 ref command,
                 ref cause,
@@ -402,7 +391,7 @@ impl fmt::Display for Error {
                 )?;
                 format_output(output, f)
             }
-            Error::__Nonexhaustive => panic!(),
+            Error::CrossCompilation | Error::__Nonexhaustive => panic!(),
         }
     }
 }
@@ -596,6 +585,8 @@ impl Config {
         if host == target {
             return true;
         }
+        // always enable PKG_CONFIG_ALLOW_CROSS override in Debian
+        return true;
 
         // pkg-config may not be aware of cross-compilation, and require
         // a wrapper script that sets up platform-specific prefixes.
@@ -653,7 +644,12 @@ impl Config {
     }
 
     fn run(&self, name: &str, args: &[&str]) -> Result<Vec<u8>, Error> {
-        let pkg_config_exe = self.targeted_env_var("PKG_CONFIG");
+        let pkg_config_exe = self.targeted_env_var("PKG_CONFIG").or_else(|| {
+            self.env_var_os("DEB_HOST_GNU_TYPE").map(|mut t| {
+                t.push(OsString::from("-pkgconf"));
+                t
+            })
+        });
         let fallback_exe = if pkg_config_exe.is_none() {
             Some(OsString::from("pkgconf"))
         } else {
diff --git a/vendor/pkg-config-0.3.30/tests/test.rs b/vendor/pkg-config-0.3.30/tests/test.rs
index 0f37c7224d..f70e8b711b 100644
--- a/vendor/pkg-config-0.3.30/tests/test.rs
+++ b/vendor/pkg-config-0.3.30/tests/test.rs
@@ -31,7 +31,6 @@ fn find(name: &str) -> Result<pkg_config::Library, Error> {
     pkg_config::probe_library(name)
 }
 
-#[test]
 fn cross_disabled() {
     let _g = LOCK.lock();
     reset();
@@ -43,7 +42,6 @@ fn cross_disabled() {
     }
 }
 
-#[test]
 fn cross_enabled() {
     let _g = LOCK.lock();
     reset();