[maemo-commits] [maemo-commits] r9919 - projects/haf/trunk/apt

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-02-15 18:27:40 +0200 (Thu, 15 Feb 2007)
New Revision: 9919

Modified:
   projects/haf/trunk/apt/configure
   projects/haf/trunk/apt/configure.in
Log:
  * Get the host architecture name from dpkg-architecture instead of
    guessing via the archtable.


Modified: projects/haf/trunk/apt/configure
===================================================================
--- projects/haf/trunk/apt/configure	2007-02-15 16:27:13 UTC (rev 9918)
+++ projects/haf/trunk/apt/configure	2007-02-15 16:27:40 UTC (rev 9919)
@@ -3953,7 +3953,7 @@
 
 echo "$as_me:$LINENO: checking system architecture" >&5
 echo $ECHO_N "checking system architecture... $ECHO_C" >&6
-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
   { { echo "$as_me:$LINENO: error: failed: use --host= or check buildlib/archtable" >&5
 echo "$as_me: error: failed: use --host= or check buildlib/archtable" >&2;}

Modified: projects/haf/trunk/apt/configure.in
===================================================================
--- projects/haf/trunk/apt/configure.in	2007-02-15 16:27:13 UTC (rev 9918)
+++ projects/haf/trunk/apt/configure.in	2007-02-15 16:27:40 UTC (rev 9919)
@@ -79,7 +79,7 @@
 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)
 fi