Bug#236331: dpkg-architecture does not rewrite gcc system type i586-gnu properly

[Michael Banck <mbanck@debian.org>]

Package: dpkg
Version: 1.10.18
Severity: normal
Tags: patch
Architecture: hurd-i386

rewrite_gnu() in dpkg-architecture does not work properly for current
hurd-i386 systems. Apparently, the output of 'gcc -dumpmachine' got
changed to read 'i586-gnu' some time back, which results in the
following warning from dpkg-architecture:

dpkg-architecture: warning: Unknown gcc system type i586-gnu, falling
	back to default (native compilation)
dpkg-architecture: warning: Specified GNU system type i386-gnu does
	not match gcc system type i586-gnu.

This is really highly annoying when building debian packages.

The attached patch (prepared and approved by Marcus Brinkmann) fixes
this.


Thanks,

Michael

--- dpkg-architecture.orig	2004-03-04 00:59:34.000000000 +0100
+++ dpkg-architecture	2004-03-04 01:27:57.000000000 +0100
@@ -98,7 +98,7 @@
 sub rewrite_gnu {
 	local ($_) = @_;
 
-	s/(?:i386|i486|i586|i686|pentium)(.*linux)/i386$1/;
+	s/(?:i386|i486|i586|i686|pentium)(.*(linux|gnu))/i386$1/;
 	s/ppc/powerpc/;
 	s/openbsd([\d\.]+$)/openbsd/;
 	s/-unknown-/-/;