From: Guillem Jover <guillem@debian.org>
Date: Sat, 28 Jan 2006 04:29:10 +0000 (+0000)
Subject: Make dpkg-architecture not print the warning about a missmatch between
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e2356c0e90a7ae4e9ae91212133ffb0f46ae26f;p=dpkg

Make dpkg-architecture not print the warning about a missmatch between
gcc target machine type and GNU target system type if the actions are
'-e' or '-i'.
---

diff --git a/ChangeLog b/ChangeLog
index 68468ed7..4cfe554b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-28  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-architecture.pl: Do not print the warning about a
+	missmatch between gcc target machine type and GNU target system
+	type if the actions are '-e' or '-i'.
+
 2006-01-27  Frank Lichtenheld  <djpig@debian.org>
 
 	* scripts/dpkg-shlibdeps.pl: Honor LD_LIBRARY_PATH when
diff --git a/debian/changelog b/debian/changelog
index c76a1898..eb2fd52e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,9 @@ dpkg (1.13.13~) unstable; urgency=low
   * Document the correct format string for dpkg-query --showformat option.
     Update -l example and lower case the program name in the title header.
     Thanks to Zefram <zefram@fysh.org>. Closes: #174976
+  * Make dpkg-architecture not print the warning about a missmatch between
+    gcc target machine type and GNU target system type if the actions are
+    '-e' or '-i'.
 
  --
 
diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl
index 13804751..82abb4c6 100755
--- a/scripts/dpkg-architecture.pl
+++ b/scripts/dpkg-architecture.pl
@@ -200,7 +200,7 @@ $deb_host_gnu_type = $req_host_gnu_type if $req_host_gnu_type ne '';
 
 #$gcc = `\${CC:-gcc} --print-libgcc-file-name`;
 #$gcc =~ s!^.*gcc-lib/(.*)/\d+(?:.\d+)*/libgcc.*$!$1!s;
-&warn("Specified GNU system type $deb_host_gnu_type does not match gcc system type $gcc.") if ($gcc ne '') && ($gcc ne $deb_host_gnu_type);
+&warn("Specified GNU system type $deb_host_gnu_type does not match gcc system type $gcc.") if !($req_is_arch or $req_eq_arch) && ($gcc ne '') && ($gcc ne $deb_host_gnu_type);
 
 # Split the Debian and GNU names
 ($deb_host_arch_os, $deb_host_arch_cpu) = &split_debian($deb_host_arch);