--- Begin Message ---
- To: submit@bugs.debian.org
- Subject: apt: use dpkg-architecture to get host architecture
- From: Guillem Jover <guillem.jover@nokia.com>
- Date: Tue, 16 Jan 2007 20:38:35 +0200
- Message-id: <20070116183835.GA11006@ziggurat.research.nokia.com>
Package: apt
Version: 0.6.46.4
Tags: patch
Hi,
As part of the move to armel, dpkg was patched (which should get the
patch merged upstream RSN), and apt needed patching as well to make it
aware of the new arch. This patch solves the problem by moving that
knowledge to dpkg where it belongs. This also avoids out of sync arch
support in the future between apt and dpkg.
Just for reference, the GNU triplet for armel is arm-linux-gnueabi, so
the patterns need to match on gnu%.
regards,
guillem
--- buildlib/archtable 2006-03-02 16:26:52.000000000 +0200
+++ buildlib/archtable 1970-01-01 02:00:00.000000000 +0200
@@ -1,29 +0,0 @@
-# This file contains a table of known architecture strings, with
-# things to map them to. `configure' will take the output of the
-# autoconf cannon macros and look in here. This only deals with architecture
-# (CPU) names.
-
-# The left side is a regex for awk
-
-i.86 i386
-pentium i386
-sparc sparc
-sparc64 sparc
-alpha.* alpha
-m68k m68k
-arm.*b armeb
-arm.* arm
-powerpc powerpc
-ppc powerpc
-powerpc64 ppc64
-mipsel mipsel
-mipseb mips
-mips mips
-sheb sheb
-shel sh
-sh sh
-hppa.* hppa
-ia64 ia64
-s390 s390
-s390x s390x
-x86_64 amd64
--- buildlib/environment.mak.in 2006-03-02 15:56:30.000000000 +0200
+++ buildlib/environment.mak.in 2006-12-14 23:31:21.000000000 +0200
@@ -62,7 +62,7 @@ NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_
# Shared library things
HOST_OS = @host_os@
-ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0)
+ifneq ($(words $(filter gnu% linux-gnu% kfreebsd-gnu% %-gnu,$(HOST_OS))),0)
SONAME_MAGIC=-Wl,-soname -Wl,
LFLAGS_SO=
else
--- buildlib/ostable 2006-03-02 15:46:44.000000000 +0200
+++ buildlib/ostable 1970-01-01 02:00:00.000000000 +0200
@@ -1,21 +0,0 @@
-# This file contains a table of known vendor-os strings, with
-# things to map them to. `configure' will take the output of the
-# autoconf cannon macros and look in here. This only deals with
-# OS names. The right should be a common name like the arch table
-# generates
-# The final bit to build the Debian Architecture is done in init.cc
-# The left side is a regex for awk, and the first match is used.
-
-# These are used by Debian
-[^-]*-linux-.* linux
-[^-]*-kfreebsd.*-gnu kfreebsd
-[^-]*-knetbsd.*-gnu knetbsd
-[^-]*-gnu[^-]* hurd
-
-# These are samples.
-hp-hpux[^-]* hp-ux
-sun-solaris[^-]* solaris
-[^-]*-openbsd[^-]* openbsd
-
-# Catch all
-.* unknown
--- configure.in 2006-10-30 09:51:28.000000000 +0200
+++ configure.in 2006-12-05 12:47:48.000000000 +0200
@@ -79,9 +79,9 @@ AC_SUBST(BDBLIB)
dnl Converts the ARCH to be something singular for this general CPU family
dnl This is often the dpkg architecture string.
AC_MSG_CHECKING(system architecture)
-archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target_cpu\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/archtable`"
+archset="`dpkg-architecture -qDEB_HOST_ARCH`"
if test "x$archset" = "x"; then
- AC_MSG_ERROR(failed: use --host= or check buildlib/archtable)
+ AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture])
fi
AC_MSG_RESULT($archset)
AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset")
@@ -89,7 +89,7 @@ AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset"
dnl Get a common name for the host OS - this is primarily only for HURD and is
dnl non fatal if it fails
AC_MSG_CHECKING(system OS)
-osset="`awk \" ! /^#|^\\\$/ {if (match(\\\"$target_vendor-$target_os\\\",\\\$1)) {print \\\$2; exit}}\" $srcdir/buildlib/ostable`"
+osset="`dpkg-architecture -qDEB_HOST_ARCH_OS`"
AC_MSG_RESULT($osset)
AC_DEFINE_UNQUOTED(COMMON_OS,"$osset")
--- End Message ---
--- Begin Message ---
Source: apt
Source-Version: 0.7.5
We believe that the bug you reported is fixed in the latest version of
apt, which is due to be installed in the Debian FTP archive:
apt-doc_0.7.5_all.deb
to pool/main/a/apt/apt-doc_0.7.5_all.deb
apt-transport-https_0.7.5_i386.deb
to pool/main/a/apt/apt-transport-https_0.7.5_i386.deb
apt-utils_0.7.5_i386.deb
to pool/main/a/apt/apt-utils_0.7.5_i386.deb
apt_0.7.5.dsc
to pool/main/a/apt/apt_0.7.5.dsc
apt_0.7.5.tar.gz
to pool/main/a/apt/apt_0.7.5.tar.gz
apt_0.7.5_i386.deb
to pool/main/a/apt/apt_0.7.5_i386.deb
libapt-pkg-dev_0.7.5_i386.deb
to pool/main/a/apt/libapt-pkg-dev_0.7.5_i386.deb
libapt-pkg-doc_0.7.5_all.deb
to pool/main/a/apt/libapt-pkg-doc_0.7.5_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 407187@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Otavio Salvador <otavio@ossystems.com.br> (supplier of updated apt package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Wed, 25 Jul 2007 20:16:46 -0300
Source: apt
Binary: apt-utils libapt-pkg-doc libapt-pkg-dev apt-transport-https apt-doc apt
Architecture: source all i386
Version: 0.7.5
Distribution: unstable
Urgency: low
Maintainer: APT Development Team <deity@lists.debian.org>
Changed-By: Otavio Salvador <otavio@ossystems.com.br>
Description:
apt - Advanced front-end for dpkg
apt-doc - Documentation for APT
apt-transport-https - APT https transport
apt-utils - APT utility programs
libapt-pkg-dev - Development files for APT's libapt-pkg and libapt-inst
libapt-pkg-doc - Documentation for APT development
Closes: 407187 408201
Changes:
apt (0.7.5) unstable; urgency=low
.
[ Otavio Salvador ]
* Applied patch from Guillem Jover <guillem@debian.org> to use
dpkg-architecture to get the host architecture (closes: #407187)
* Applied patch from Guillem Jover <guillem@debian.org> to add
support to add lzma support (closes: #408201)
.
[ Michael Vogt ]
* apt-pkg/depcache.cc:
- support a list of sections for:
APT::Install-Recommends-Sections
APT::Never-MarkAuto-Sections
* methods/makefile:
- install lzma symlink method (for full lzma support)
* debian/control:
- suggest "lzma"
Files:
0a28a15027cc8801cfe123113708d497 942 admin important apt_0.7.5.dsc
6c0f7804711343eb996642588d78d6be 1821748 admin important apt_0.7.5.tar.gz
ffa6fb0b48bd66ddb3e1e39f6488e290 91894 doc optional apt-doc_0.7.5_all.deb
7b92911b04867d21307d06efa2fcc645 115854 doc optional libapt-pkg-doc_0.7.5_all.deb
bd6c74a41ca19df839aae1b5382ddca3 50778 admin optional apt-transport-https_0.7.5_i386.deb
9c8f0a29bb69ceea6658740709ed82a7 1460576 admin important apt_0.7.5_i386.deb
c56f9b358c4f72f86b95fc31977037fa 99626 libdevel optional libapt-pkg-dev_0.7.5_i386.deb
6d33e26d011caa449749db17bdee6dc8 190468 admin important apt-utils_0.7.5_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFGr3+pLqiZQEml+FURAkU2AKCVXR29w86CbXaw3vS8sojnqLn7qgCgui0F
5qDBtA9gRHkyrZWwN7AXabc=
=llY8
-----END PGP SIGNATURE-----
--- End Message ---