Prechádzať zdrojové kódy

Add support for the new Hurd-style i386-gnu triplets; rather than hacking
this onto the Linux support, I'm deliberately doing it separately so when
they change it again, we don't have to unbreak things.

Scott James Remnant 22 rokov pred
rodič
commit
e3849b659f
3 zmenil súbory, kde vykonal 7 pridanie a 0 odobranie
  1. 5 0
      ChangeLog
  2. 1 0
      debian/changelog
  3. 1 0
      scripts/dpkg-architecture.pl

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+Tue Apr 27 19:47:37 BST 2004 Scott James Remnant <scott@netsplit.com>
+
+  * scripts/dpkg-architecture.pl (rewrite_gnu): Add a new regexp for
+  parsing i386-gnu style triplets on the Hurd.
+
 Tue Apr 27 19:23:01 BST 2004 Scott James Remnant <scott@netsplit.com>
 
   * main/dpkg.8: Correct reference to non-existant --force-reinstreq

+ 1 - 0
debian/changelog

@@ -1,6 +1,7 @@
 dpkg (1.10.22) unstable; urgency=low
 
   * Add amd64 support. Closes: #238483, #241938.
+  * Add i?86-gnu support.  Closes: #216695, #236331.
   * Stop hardcoding the list of manual page languages in debian/rules,
     so we include Spanish, Russian and Brazilian Portugese.  Closes: #245994.
   * Correct dpkg manpage to refer to --force-remove-reinstreq instead of

+ 1 - 0
scripts/dpkg-architecture.pl

@@ -100,6 +100,7 @@ sub rewrite_gnu {
 	local ($_) = @_;
 
 	s/(?:i386|i486|i586|i686|pentium)(.*linux)/i386$1/;
+	s/(?:i386|i486|i586|i686|pentium)(.*gnu)/i386$1/;
 	s/ppc/powerpc/;
 	s/openbsd([\d\.]+$)/openbsd/;
 	s/-unknown-/-/;