On Wed, Mar 09, 2011 at 03:47:00AM +0100, Guillem Jover wrote: > On Tue, 2011-03-08 at 15:11:10 -0800, Steve Langasek wrote: > > Add new variables that return the "ideal" GNU triplet for each architecture > > which should be used as the path component for library installation. > > diff --git a/multiarchtable b/multiarchtable > > new file mode 100644 > > index 0000000..031879b > > --- /dev/null > > +++ b/multiarchtable > > @@ -0,0 +1,4 @@ > > +# Bidirectional mapping between a GNU triplet and a Multiarch triplet. > > +# > > +# <GNU triplet> <Multiarch triplet> > > +i486-linux-gnu i386-linux-gnu > This has the slight problem of needing to be diverged for Ubuntu and > other derivatives where the baseline triplet is different from Debian. Yep. > So I guess this would need either the corresponding fixup in > debian/rules, Ah, yes; hadn't realized that this was being done via debian/rules, I guess it would have had to be since dpkg was otherwise in sync between Debian and Ubuntu. I can add this. > or maybe better to use a regex for the GNU triplet, although then the > bi-direction mapping becomes a bit more cumbersome, but I don't think we > need it right now anyway? ... or I can drop the bi-directional mapping, too, whichever you prefer. I agree that there's no strong need for it, I was just following the model of the existing code. I don't think it's worth doing this with regex, though; I would just add multiple entries to the table. BTW, I've just noticed that the !linux i386 architectures also need to be added to this table; sorry about that. I can clean that up at the same time as fixing the above issue, however you recommend it be fixed. -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slangasek@ubuntu.com vorlon@debian.org
Attachment:
signature.asc
Description: Digital signature