[src/trunk]: src/external/bsd/atf Fix the values of atf_arch and atf_machine:...

[jmmv <jmmv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/44f11fbd6d3c
branches:  trunk
changeset: 762426:44f11fbd6d3c
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Sun Feb 20 20:56:34 2011 +0000

description:
Fix the values of atf_arch and atf_machine: the former is supposed to be
the cpu name and the latter the port name.  They had been reversed until
now due to some "smart" stupidity^Wlogic in the upstream configure script,
which is now gone.

This is a pullup of revision f9329ca68da7e8557e0803b5747a12f8c10b1258
plus the corresponding reachover build changes.

Addresses PR bin/44305.

diffstat:

 external/bsd/atf/dist/atf-config/integration_test.sh |  32 --------------------
 external/bsd/atf/lib/libatf-c/Makefile               |   8 +++-
 2 files changed, 5 insertions(+), 35 deletions(-)

diffs (83 lines):

diff -r a1a069114633 -r 44f11fbd6d3c external/bsd/atf/dist/atf-config/integration_test.sh
--- a/external/bsd/atf/dist/atf-config/integration_test.sh      Sun Feb 20 20:18:56 2011 +0000
+++ b/external/bsd/atf/dist/atf-config/integration_test.sh      Sun Feb 20 20:56:34 2011 +0000
@@ -164,36 +164,6 @@
     done
 }
 
-# XXX: This does not seem to belong here...
-atf_test_case arch
-arch_head()
-{
-    atf_set "descr" "Tests that the current value of atf_arch is correct" \
-                    "for the corresponding atf_machine"
-}
-arch_body()
-{
-    atf_check -s eq:0 -o save:stdout -e empty atf-config -t atf_arch
-    arch=$(cat stdout)
-    atf_check -s eq:0 -o save:stdout -e empty atf-config -t atf_machine
-    machine=$(cat stdout)
-    echo "Machine type ${machine}, architecture ${arch}"
-
-    case ${machine} in
-        i386|i486|i586|i686)
-            exp_arch=i386
-            ;;
-        x86_64)
-            exp_arch=amd64
-            ;;
-        *)
-            exp_arch=${machine}
-    esac
-    echo "Expected architecture ${exp_arch}"
-
-    atf_check_equal ${arch} ${exp_arch}
-}
-
 atf_init_test_cases()
 {
     atf_add_test_case list_all
@@ -205,8 +175,6 @@
     atf_add_test_case query_mixture
 
     atf_add_test_case override_env
-
-    atf_add_test_case arch
 }
 
 # vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4
diff -r a1a069114633 -r 44f11fbd6d3c external/bsd/atf/lib/libatf-c/Makefile
--- a/external/bsd/atf/lib/libatf-c/Makefile    Sun Feb 20 20:18:56 2011 +0000
+++ b/external/bsd/atf/lib/libatf-c/Makefile    Sun Feb 20 20:56:34 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/11/07 17:46:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2011/02/20 20:56:34 jmmv Exp $
 
 NOLINT=                # defined
 
@@ -16,7 +16,7 @@
 CPPFLAGS+=     -I.
 
 CPPFLAGS+=     -DHAVE_CONFIG_H
-CPPFLAGS+=     -DATF_ARCH=\"${MACHINE}\"
+CPPFLAGS+=     -DATF_ARCH=\"${MACHINE_ARCH}\"
 CPPFLAGS+=     -DATF_BUILD_CC=\"/usr/bin/cc\"
 CPPFLAGS+=     -DATF_BUILD_CFLAGS=\"\"
 CPPFLAGS+=     -DATF_BUILD_CPP=\"/usr/bin/cpp\"
@@ -27,12 +27,14 @@
 CPPFLAGS+=     -DATF_INCLUDEDIR=\"/usr/include\"
 CPPFLAGS+=     -DATF_LIBDIR=\"/usr/lib\"
 CPPFLAGS+=     -DATF_LIBEXECDIR=\"/usr/libexec\"
-CPPFLAGS+=     -DATF_MACHINE=\"${MACHINE_ARCH}\"
+CPPFLAGS+=     -DATF_MACHINE=\"${MACHINE}\"
 CPPFLAGS+=     -DATF_M4=\"/usr/bin/m4\"
 CPPFLAGS+=     -DATF_PKGDATADIR=\"/usr/share/atf\"
 CPPFLAGS+=     -DATF_SHELL=\"/bin/sh\"
 CPPFLAGS+=     -DATF_WORKDIR=\"/tmp\"
 
+config.o:      Makefile
+
 WARNS?=                4
 
 SRCS=          build.c \