* buildlib/systemtable, configure.in:

  added new buildlib/systemtable to map complette canonical system type
  to apt architecture and add support for lpia

diff --git a/buildlib/systemtable b/buildlib/systemtable
new file mode 100644 (file)
index 0000000..64c176b
--- /dev/null
+++ b/buildlib/systemtable
@@ -0,0 +1,11 @@
+# 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 c7bf253d19113b464ad94d6f710836e6fc364c72..4aa56e117ebffac67ef584d730443f3ecdd26ed0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --

-AC_DEFINE_UNQUOTED(VERSION,"0.6.46.5")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.47")

 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)


@@ -78,10 +78,15 @@ AC_SUBST(BDBLIB)
 
 dnl Converts the ARCH to be something singular for this general CPU family
 dnl This is often the dpkg architecture string.
 
 dnl Converts the ARCH to be something singular for this general CPU family
 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)
 AC_MSG_CHECKING(system architecture)

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

 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)
   AC_MSG_ERROR(failed: use --host= or check buildlib/archtable)

+ fi

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

diff --git a/debian/changelog b/debian/changelog
index 4918ee7f750a1dd2506c686df708f132939bfdc0..483c22796598dbb7a927661b2206d3902332d065 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,6 +46,10 @@ apt (0.6.47) UNRELEASED; urgency=low
   * buildlib/archtable:
     - added support for sh3/sh4 (closes: #424870)
     - added support for m32r (closes: #394096)
   * buildlib/archtable:
     - added support for sh3/sh4 (closes: #424870)
     - added support for m32r (closes: #394096)

+  * buildlib/systemtable:
+    - added support for lpia
+  * configure.in:
+    - check systemtable for architecture mapping too

   
  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100
 
   
  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100