Hi,
Some additional comments:
On Mon, Apr 10, 2006 at 06:03:44PM -0700, Erast Benson wrote:
> On Tue, 2006-04-11 at 01:59 +0200, Frank Lichtenheld wrote:
> > On Mon, Apr 10, 2006 at 02:15:15PM -0700, Erast Benson wrote:
> > > Index: scripts/dpkg-architecture.pl
> > > ===================================================================
> > > --- scripts/dpkg-architecture.pl (.../pool/current) (revision 20420)
> > > +++ scripts/dpkg-architecture.pl (.../trunk) (revision 20420)
> > > @@ -81,7 +81,7 @@
> > > sub split_debian {
> > > local ($_) = @_;
> > >
> > > - if (/^([^-]*)-(.*)/) {
> > > + if (/^([^-][a-zA-Z_]+)[\.\d]*-(.*)/) {
> >
> > Could you explain what format is matched here and why you are
> > so strict in the first part? What exactly is [.\d] part for?
> > Can't we just use ([^-]*?)[\.\d]* ?
>
> Confirm. This works too: /^([^-]*?)[\.\d]*-(.*)/
You've not replied why this change is needed.
> > > @@ -151,6 +151,7 @@
> > > # Set default values:
> > >
> > > chomp ($deb_build_arch = `dpkg --print-architecture`);
> > > +($deb_os, $deb_cpu) = &split_debian($deb_host_arch);
> > > &syserr("dpkg --print-architecture failed") if $?>>8;
> > > $deb_build_gnu_type = &debian_to_gnu($deb_build_arch);
> > >
> > > @@ -258,6 +259,23 @@
> > > DEB_HOST_ARCH DEB_HOST_ARCH_OS DEB_HOST_ARCH_CPU
> > > DEB_HOST_GNU_CPU DEB_HOST_GNU_SYSTEM DEB_HOST_GNU_TYPE);
> > >
> > > +# nexenta fixups...
> > > +# Since solaris-<cpu> port relays on OpenSolaris core(i.e. not GNU C
> > > library),
> > > +# we have to follow its architecture convention for DEB_BUILD_GNU_TYPE
> > > and
> > > +# DEB_HOST_GNU_TYPE, otherwise autoconf and related scripts might not
> > > enable
> > > +# <cpu>-pc-solaris2.<krel> specific optimizations
> > > +if ($deb_os == "solaris") {
> > > + my $krel=`uname -r`;
> > > + chomp $krel;
> > > + $krel =~ s/\d+(.*)/\1/;
> > > + $deb_build_gnu_system = "solaris";
> > > + $deb_host_gnu_system = "solaris";
> > > + $deb_build_gnu_type =~ s/i486/i386/;
> > > + $deb_build_gnu_type .= "$krel";
> > > + $deb_host_gnu_type =~ s/i486/i386/;
> > > + $deb_host_gnu_type .= "$krel";
> > > +}
> [...]. Be great if you guys accept the first part of
> this patch(i.e. dpkg-architecture + ostable).
I don't understand what is this doing here. There's no patch for
ostable, this part should go there. Also your initial proposed
output seems wrong:
> Resulted printouts should be:
> $ dpkg-architecture
[...]
> DEB_BUILD_GNU_CPU=i486
Why is this different than the one on GNU_TYPE?
> DEB_BUILD_GNU_SYSTEM=solaris
This should match the GNU_TYPE as well, so solaris2.11.
> DEB_BUILD_GNU_TYPE=i386-pc-solaris2.11
The -pc- part should not be here.
> DEB_HOST_GNU_CPU=i486
> DEB_HOST_GNU_SYSTEM=solaris
> DEB_HOST_GNU_TYPE=i386-pc-solaris2.11
The same applies for this ones.
regards,
guillem
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
