From 0fbb494b343342af795a17a56d4b915499c52ed9 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 25 Jul 2007 20:27:40 -0300 Subject: [PATCH] * Applied patch from Guillem Jover to use dpkg-architecture to get the host architecture (closes: #407187) --- buildlib/archtable | 33 --------------------------------- buildlib/environment.mak.in | 2 +- buildlib/ostable | 21 --------------------- buildlib/systemtable | 11 ----------- configure.in | 9 +++------ debian/changelog | 7 +++++++ 6 files changed, 11 insertions(+), 72 deletions(-) delete mode 100644 buildlib/archtable delete mode 100644 buildlib/ostable delete mode 100644 buildlib/systemtable diff --git a/buildlib/archtable b/buildlib/archtable deleted file mode 100644 index eacc9889..00000000 --- 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 2d28e1c6..4e47692f 100644 --- 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@ -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 diff --git a/buildlib/ostable b/buildlib/ostable deleted file mode 100644 index ead7d771..00000000 --- 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 index 64c176b5..00000000 --- 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 9bb1a8ba..ad913f53 100644 --- 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) -archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/systemtable`" +archset="`dpkg-architecture -qDEB_HOST_ARCH`" 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") @@ -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) -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") diff --git a/debian/changelog b/debian/changelog index 1d96d42d..579dd4e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.5) UNRELEASED; urgency=low + + * Applied patch from Guillem Jover to use + dpkg-architecture to get the host architecture (closes: #407187) + + -- Otavio Salvador Wed, 25 Jul 2007 20:16:46 -0300 + apt (0.7.4) unstable; urgency=low [ Michael Vogt ] -- 2.20.1