Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the values of atf_arch and atf_machine: the former is supposed to be

Browse Source 
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.
This commit is contained in:
jmmv 2011-02-20 20:56:34 +00:00
parent 4d916cb08c
commit a3b86068ff
2 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
external/bsd/atf/dist/atf-config/integration_test.sh vendored
View File

@ -164,36 +164,6 @@ override_env_body()
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_init_test_cases()
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

8
external/bsd/atf/lib/libatf-c/Makefile vendored
View File

@ -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${.CURDIR}
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_CONFDIR=\"/etc/atf\"
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 \