tags 361866 +patch Patch is against dpkg 1.13.11.
Index: debian/control =================================================================== --- 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] 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]*-(.*)/) { 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 =================================================================== --- scripts/dpkg-shlibdeps.pl (.../pool/current) (revision 20420) +++ scripts/dpkg-shlibdeps.pl (.../trunk) (revision 20420) @@ -104,7 +104,7 @@ defined($c= open(P,"-|")) || syserr("cannot fork for ldd"); if (!$c) { exec("ldd","--",$exec[$i]); syserr("cannot exec ldd"); } while (<P>) { - if (m,^\s+(\S+)\s+=>\s+(\S+)\s+\(0x.+\)?$,) { + if (m,^\s+(\S+)\s+=>\s+(\S+),) { $so2path{$1} = $2; } } -- Erast -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]