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:
> > --- debian/control (.../pool/current) (revision 20420)
> > +++ debian/control (.../trunk) (revision 20420)
> > @@ -5,7 +5,7 @@
> > Origin: debian
> > Bugs: debbugs://bugs.debian.org
> > Standards-Version: 3.6.1.0
> > -Build-Depends: debhelper (>= 4.1.81), libncurses5-dev | libncurses-dev,
> > zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev, libsepol1-dev [!hurd-i386
> > !kfreebsd-i386], libselinux1-dev [!hurd-i386 !kfreebsd-i386]
> > +Build-Depends: debhelper (>= 4.1.81), libncurses5-dev | libncurses-dev,
> > zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev, libsepol1-dev [!hurd-i386
> > !kfreebsd-i386 !solaris-i386], libselinux1-dev [!hurd-i386 !kfreebsd-i386
> > !solaris-i386]
> >
> > Package: dpkg
> > Architecture: any
> > @@ -26,7 +26,7 @@
> > Section: utils
> > Priority: standard
> > Architecture: all
> > -Depends: dpkg (>= 1.13.1), perl5, perl-modules, cpio (>= 2.4.2-2), patch
> > (>= 2.2-1), make, binutils
> > +Depends: dpkg (>= 1.13.1), perl5, perl-modules, cpio (>= 2.4.2-2), patch
> > (>= 2.2-1), make, binutils, sunwtoo [solaris-i386]
>
> strictly speaking this would need a versioned build-depends on dpkg-dev,
> wouldn't it?
you meant for sunwtoo package? We need it at install time for
dpkg-shlibdeps. It provides OpenSolaris's native /usr/bin/ldd.
OK. I looked at 1.13.17 dpkg-shlibdeps and found that you now use
non-ldd way to find out link dependencies. Than sunwtoo dep not needed
any longer.
> > Recommends: gcc | c-compiler, bzip2
> > Suggests: gnupg, debian-keyring
> > Conflicts: dpkgname
> > 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]*-(.*)/
> > return ($1, $2);
> > } else {
> > return ("linux", $_);
> > @@ -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";
> > +}
> > +
> > $env{'DEB_BUILD_ARCH'}=$deb_build_arch;
> > $env{'DEB_BUILD_ARCH_OS'}=$deb_build_arch_os;
> > $env{'DEB_BUILD_ARCH_CPU'}=$deb_build_arch_cpu;
> > Index: scripts/dpkg-shlibdeps.pl
>
> The dpkg-shlibdeps part doesn't apply anymore. Have you tested an
> more recent dpkg-shlibdeps yet? There were many changes so chances
> are we broke something for you.
Right. However, we are "sitting" on top of Ubuntu, and it is still using
1.13.11. binutil's objdump is failing on SunOS for 64-bit binaries. We
are planning to extend it. Be great if you guys accept the first part of
this patch(i.e. dpkg-architecture + ostable).
--
Erast
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
