Module Name: src
Committed By: jmmv
Date: Sun Feb 20 20:56:34 UTC 2011
Modified Files:
src/external/bsd/atf/dist/atf-config: integration_test.sh
src/external/bsd/atf/lib/libatf-c: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/atf/dist/atf-config/integration_test.sh
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/lib/libatf-c/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-config/integration_test.sh
diff -u src/external/bsd/atf/dist/atf-config/integration_test.sh:1.1.1.3 src/external/bsd/atf/dist/atf-config/integration_test.sh:1.2
--- src/external/bsd/atf/dist/atf-config/integration_test.sh:1.1.1.3 Sun Nov 7 17:43:26 2010
+++ src/external/bsd/atf/dist/atf-config/integration_test.sh Sun Feb 20 20:56:34 2011
@@ -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
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.8 src/external/bsd/atf/lib/libatf-c/Makefile:1.9
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.8 Sun Nov 7 17:46:46 2010
+++ src/external/bsd/atf/lib/libatf-c/Makefile Sun Feb 20 20:56:34 2011
@@ -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 \
