* Applied patch from Guillem Jover <guillem.jover@nokia.com> to use

  dpkg-architecture to get the host architecture (closes: #407187)

diff --git a/buildlib/archtable b/buildlib/archtable
deleted file mode 100644 (file)
index eacc988..0000000
--- a/buildlib/archtable
+++ /dev/null
@@ -1,33 +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
-sh3    sh3
-sh4    sh4
-m32r   m32r
-hppa.* hppa
-ia64   ia64
-s390   s390
-s390x  s390x
-x86_64 amd64
-# lipa has gnulp-linux-i.86 (see dpkg archtable and ostable)

diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index 2d28e1c6749fe86cb7a1dd87c10d8feb0a8f759d..4e47692f50f3e5aabee681c026078d24298e3e00 100644 (file)
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -64,7 +64,7 @@ NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
 
 # Shared library things
 HOST_OS = @host_os@
 
 # 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
    SONAME_MAGIC=-Wl,-soname -Wl,
    LFLAGS_SO=
 else

diff --git a/buildlib/ostable b/buildlib/ostable
deleted file mode 100644 (file)
index ead7d77..0000000
--- a/buildlib/ostable
+++ /dev/null
@@ -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

diff --git a/buildlib/systemtable b/buildlib/systemtable
deleted file mode 100644 (file)
index 64c176b..0000000
--- a/buildlib/systemtable
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file contains a table of known canonical system strings, with
-# things to map them to. `configure' will take the output of the
-# autoconf cannon macros and look in here. It will check for
-# the full canonical system name (required for e.g. lpia) and if that 
-# fails it will configure.in will fallback to just checking for the CPU
-# in buildlib/archtable
-
-# The left side is a regex for awk against the canonical system name
-
-# config.guess reports lpia as i386-unknown-linux-gnulp
-i.86-.*-linux-gnulp    lpia

diff --git a/configure.in b/configure.in
index 9bb1a8baf80105dbaa3accad36d912f44869d03a..ad913f53e6a18df04936c81a79ac8a8a291ae482 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -81,12 +81,9 @@ dnl This is often the dpkg architecture string.
 dnl First check against the full canonical canoncial-system-type in $target
 dnl and if that fails, just look for the cpu
 AC_MSG_CHECKING(system architecture)
 dnl First check against the full canonical canoncial-system-type in $target
 dnl and if that fails, just look for the cpu
 AC_MSG_CHECKING(system architecture)

-archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/systemtable`"
+archset="`dpkg-architecture -qDEB_HOST_ARCH`"

 if test "x$archset" = "x"; then
 if test "x$archset" = "x"; then

- archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target_cpu\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/archtable`"
- if test "x$archset" = "x"; then
-  AC_MSG_ERROR(failed: use --host= or check buildlib/archtable)
- fi
+   AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture])

 fi
 AC_MSG_RESULT($archset)
 AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset")
 fi
 AC_MSG_RESULT($archset)
 AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset")


@@ -94,7 +91,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)
 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")
 
 AC_MSG_RESULT($osset)
 AC_DEFINE_UNQUOTED(COMMON_OS,"$osset")
 

diff --git a/debian/changelog b/debian/changelog
index 1d96d42df4d5b46f7dd0390cb7f1c815264e79a2..579dd4e5f0955fc828296d70abc9062f6b9c5021 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.7.5) UNRELEASED; urgency=low
+
+  * Applied patch from Guillem Jover <guillem.jover@nokia.com> to use
+    dpkg-architecture to get the host architecture (closes: #407187)
+
+ -- Otavio Salvador <otavio@ossystems.com.br>  Wed, 25 Jul 2007 20:16:46 -0300
+

 apt (0.7.4) unstable; urgency=low
 
   [ Michael Vogt ]
 apt (0.7.4) unstable; urgency=low
 
   [ Michael Vogt ]