[src/trunk]: src/external/bsd/atf Adjust reachover Makefiles for atf-0.19.

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

details:   https://anonhg.NetBSD.org/src/rev/5361e7ddf68c
branches:  trunk
changeset: 326634:5361e7ddf68c
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Sat Feb 08 19:15:33 2014 +0000

description:
Adjust reachover Makefiles for atf-0.19.

The main change here is that the atf-config, atf-report, atf-run and
atf-version tools no longer depend on libatf-c nor libatf-c++.  Instead,
they depend on an internal libtools.a that contains code specifically
for these tools and nothing else, making them self-contained.

diffstat:

 external/bsd/atf/Makefile.inc                      |   9 ++-
 external/bsd/atf/etc/atf/Makefile                  |   4 +-
 external/bsd/atf/lib/Makefile                      |   4 +-
 external/bsd/atf/lib/libatf-c++/Makefile           |   6 +-
 external/bsd/atf/lib/libatf-c++/shlib_version      |   4 +-
 external/bsd/atf/lib/libatf-c/Makefile             |   3 +-
 external/bsd/atf/lib/tools/Makefile                |  69 ++++++++++++++++++++++
 external/bsd/atf/share/doc/atf/Makefile            |   5 +-
 external/bsd/atf/share/examples/atf/Makefile       |   6 +-
 external/bsd/atf/share/xml/atf/Makefile            |   4 +-
 external/bsd/atf/share/xsl/atf/Makefile            |   4 +-
 external/bsd/atf/tests/atf/Makefile                |   6 +-
 external/bsd/atf/tests/atf/atf-c++/Makefile        |   4 +-
 external/bsd/atf/tests/atf/atf-c++/detail/Makefile |  17 +++-
 external/bsd/atf/tests/atf/atf-c/detail/Makefile   |  14 ++-
 external/bsd/atf/tests/atf/tools/Makefile          |  56 +++++++++++++++++
 external/bsd/atf/usr.bin/atf-config/Makefile       |   9 +-
 external/bsd/atf/usr.bin/atf-report/Makefile       |  11 +-
 external/bsd/atf/usr.bin/atf-run/Makefile          |  18 ++---
 external/bsd/atf/usr.bin/atf-version/Makefile      |  12 +-
 20 files changed, 199 insertions(+), 66 deletions(-)

diffs (truncated from 540 to 300 lines):

diff -r 581c533fcce0 -r 5361e7ddf68c external/bsd/atf/Makefile.inc
--- a/external/bsd/atf/Makefile.inc     Sat Feb 08 19:13:43 2014 +0000
+++ b/external/bsd/atf/Makefile.inc     Sat Feb 08 19:15:33 2014 +0000
@@ -1,7 +1,14 @@
-# $NetBSD: Makefile.inc,v 1.1 2013/03/14 07:10:05 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.2 2014/02/08 19:15:33 jmmv Exp $
 
 TOPDIR=                ${NETBSDSRCDIR}/external/bsd/atf
 SRCDIR=                ${TOPDIR}/dist
 
 ATF_VERSION!=  grep 'define VERSION' ${TOPDIR}/lib/libatf-c/bconfig.h \
                | cut -d '"' -f 2
+
+.if defined(USE_ATF_LIBTOOLS)
+PRIVATELIBDIR!= cd ${TOPDIR}/lib; ${PRINTOBJDIR}
+CPPFLAGS+=     -I${PRIVATELIBDIR}/tools
+LDADD+=                ${PRIVATELIBDIR}/tools/libtools.a
+DPADD+=                ${PRIVATELIBDIR}/tools/libtools.a
+.endif
diff -r 581c533fcce0 -r 5361e7ddf68c external/bsd/atf/etc/atf/Makefile
--- a/external/bsd/atf/etc/atf/Makefile Sat Feb 08 19:13:43 2014 +0000
+++ b/external/bsd/atf/etc/atf/Makefile Sat Feb 08 19:15:33 2014 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2010/11/07 17:46:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2014/02/08 19:15:33 jmmv Exp $
 
 .include <bsd.own.mk>
 
 SRCDIR=                ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH:         ${SRCDIR}/atf-run/sample
+.PATH:         ${SRCDIR}/tools/sample
 
 CONFIGFILES=   NetBSD.conf atf-run.hooks common.conf
 FILESDIR=      /etc/atf
diff -r 581c533fcce0 -r 5361e7ddf68c external/bsd/atf/lib/Makefile
--- a/external/bsd/atf/lib/Makefile     Sat Feb 08 19:13:43 2014 +0000
+++ b/external/bsd/atf/lib/Makefile     Sat Feb 08 19:15:33 2014 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2014/02/08 19:15:33 jmmv Exp $
 
-SUBDIR= libatf-c .WAIT libatf-c++
+SUBDIR= libatf-c .WAIT libatf-c++ tools
 
 .include <bsd.subdir.mk>
diff -r 581c533fcce0 -r 5361e7ddf68c external/bsd/atf/lib/libatf-c++/Makefile
--- a/external/bsd/atf/lib/libatf-c++/Makefile  Sat Feb 08 19:13:43 2014 +0000
+++ b/external/bsd/atf/lib/libatf-c++/Makefile  Sat Feb 08 19:15:33 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2013/09/12 17:14:20 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2014/02/08 19:15:33 jmmv Exp $
 
 NOLINT=                # defined
 
@@ -29,20 +29,16 @@
                config.cpp \
                env.cpp \
                exceptions.cpp \
-               expand.cpp \
                fs.cpp \
-               parser.cpp \
                process.cpp \
                tests.cpp \
                text.cpp \
-               ui.cpp \
                utils.cpp
 
 INCS=          build.hpp \
                check.hpp \
                config.hpp \
                macros.hpp \
-               noncopyable.hpp \
                tests.hpp \
                utils.hpp
 INCSDIR=       /usr/include/atf-c++
diff -r 581c533fcce0 -r 5361e7ddf68c external/bsd/atf/lib/libatf-c++/shlib_version
--- a/external/bsd/atf/lib/libatf-c++/shlib_version     Sat Feb 08 19:13:43 2014 +0000
+++ b/external/bsd/atf/lib/libatf-c++/shlib_version     Sat Feb 08 19:15:33 2014 +0000
@@ -1,3 +1,3 @@
-# $NetBSD: shlib_version,v 1.1 2012/07/11 22:40:16 jmmv Exp $
-major=0
+# $NetBSD: shlib_version,v 1.2 2014/02/08 19:15:33 jmmv Exp $
+major=1
 minor=0
diff -r 581c533fcce0 -r 5361e7ddf68c external/bsd/atf/lib/libatf-c/Makefile
--- a/external/bsd/atf/lib/libatf-c/Makefile    Sat Feb 08 19:13:43 2014 +0000
+++ b/external/bsd/atf/lib/libatf-c/Makefile    Sat Feb 08 19:15:33 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2013/03/14 07:10:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2014/02/08 19:15:33 jmmv Exp $
 
 NOLINT=                # defined
 
@@ -6,6 +6,7 @@
 
 LIB=           atf-c
 
+CWARNFLAGS+=   -Wno-format
 CWARNFLAGS+=   -Wno-missing-noreturn
 
 .PATH:         ${SRCDIR}
diff -r 581c533fcce0 -r 5361e7ddf68c external/bsd/atf/lib/tools/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/atf/lib/tools/Makefile       Sat Feb 08 19:15:33 2014 +0000
@@ -0,0 +1,69 @@
+# $NetBSD: Makefile,v 1.1 2014/02/08 19:15:33 jmmv Exp $
+
+NOLINT=                # defined
+
+.include <bsd.init.mk>
+
+LIB=           tools
+LIBISCXX=      yes
+LIBISPRIVATE=  yes
+
+LIBDPLIBS+=     m      ${.CURDIR}/../../../../../lib/libm
+
+.PATH:         ${SRCDIR}
+.PATH:         ${SRCDIR}/tools
+
+CPPFLAGS+=     -DHAVE_CONFIG_H
+CPPFLAGS+=     -DATF_ARCH=\"${MACHINE_ARCH}\"
+CPPFLAGS+=     -DATF_BUILD_CC=\"/usr/bin/cc\"
+CPPFLAGS+=     -DATF_BUILD_CFLAGS=\"\"
+CPPFLAGS+=     -DATF_BUILD_CPP=\"/usr/bin/cpp\"
+CPPFLAGS+=     -DATF_BUILD_CPPFLAGS=\"\"
+CPPFLAGS+=     -DATF_BUILD_CXX=\"/usr/bin/c++\"
+CPPFLAGS+=     -DATF_BUILD_CXXFLAGS=\"\"
+CPPFLAGS+=     -DATF_CONFDIR=\"/etc/atf\"
+CPPFLAGS+=     -DATF_INCLUDEDIR=\"/usr/include\"
+CPPFLAGS+=     -DATF_LIBDIR=\"/usr/lib\"
+CPPFLAGS+=     -DATF_LIBEXECDIR=\"/usr/libexec\"
+CPPFLAGS+=     -DATF_MACHINE=\"${MACHINE}\"
+CPPFLAGS+=     -DATF_PKGDATADIR=\"/usr/share/atf\"
+CPPFLAGS+=     -DATF_SHELL=\"/bin/sh\"
+CPPFLAGS+=     -DATF_WORKDIR=\"/tmp\"
+CPPFLAGS+=     -I${SRCDIR}/tools
+CPPFLAGS+=     -I.
+CPPFLAGS+=     -I${TOPDIR}/lib/libatf-c  # For bconfig.h
+
+WARNS?=                2
+
+SRCS=          application.cpp \
+               atffile.cpp \
+               config.cpp \
+               config_file.cpp \
+               env.cpp \
+               exceptions.cpp \
+               expand.cpp \
+               fs.cpp \
+               io.cpp \
+               parser.cpp \
+               process.cpp \
+               reader.cpp \
+               requirements.cpp \
+               signals.cpp \
+               test-program.cpp \
+               text.cpp \
+               timers.cpp \
+               ui.cpp \
+               user.cpp
+
+CLEANFILES+=   defs.hpp
+
+beforedepend: defs.hpp
+defs.hpp: defs.hpp.in
+       ${TOOL_SED} \
+           -e 's|@ATTRIBUTE_FORMAT_PRINTF@|__attribute__((__format__(__printf__, a, b)))|g' \
+           -e 's|@ATTRIBUTE_NORETURN@|__attribute__((__noreturn__))|g' \
+           -e 's|@ATTRIBUTE_UNUSED@|__attribute__((__unused__))|g' \
+           <${.ALLSRC} >${.TARGET}.tmp
+       mv ${.TARGET}.tmp ${.TARGET}
+
+.include <bsd.lib.mk>
diff -r 581c533fcce0 -r 5361e7ddf68c external/bsd/atf/share/doc/atf/Makefile
--- a/external/bsd/atf/share/doc/atf/Makefile   Sat Feb 08 19:13:43 2014 +0000
+++ b/external/bsd/atf/share/doc/atf/Makefile   Sat Feb 08 19:15:33 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/11/02 14:41:32 njoly Exp $
+# $NetBSD: Makefile,v 1.5 2014/02/08 19:15:34 jmmv Exp $
 
 .include <bsd.own.mk>
 
@@ -8,6 +8,7 @@
 .PATH: ${SRCDIR}/atf-c++
 .PATH: ${SRCDIR}/atf-sh
 .PATH: ${SRCDIR}/doc
+.PATH: ${SRCDIR}/tools
 
 .if ${MKDOC} != "no"
 FILESDIR=      /usr/share/doc/atf
@@ -21,7 +22,7 @@
        ${TOOL_SED} \
            -e 's,__DOCDIR__,/usr/share/doc/atf,g' \
            -e 's,__TESTSDIR__,/usr/tests,g' \
-           <${SRCDIR}/doc/atf.7.in >atf.7.tmp
+           <${SRCDIR}/tools/atf.7.in >atf.7.tmp
        mv atf.7.tmp atf.7
 
 .include <bsd.files.mk>
diff -r 581c533fcce0 -r 5361e7ddf68c external/bsd/atf/share/examples/atf/Makefile
--- a/external/bsd/atf/share/examples/atf/Makefile      Sat Feb 08 19:13:43 2014 +0000
+++ b/external/bsd/atf/share/examples/atf/Makefile      Sat Feb 08 19:15:33 2014 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2014/02/08 19:15:34 jmmv Exp $
 
 .include <bsd.own.mk>
 
 .if ${MKSHARE} != "no"
 SRCDIR=                ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH:         ${SRCDIR}/atf-report
-.PATH:         ${SRCDIR}/atf-run/sample
+.PATH:         ${SRCDIR}/tools
+.PATH:         ${SRCDIR}/tools/sample
 
 FILESDIR=      /usr/share/examples/atf
 FILESMODE=     444
diff -r 581c533fcce0 -r 5361e7ddf68c external/bsd/atf/share/xml/atf/Makefile
--- a/external/bsd/atf/share/xml/atf/Makefile   Sat Feb 08 19:13:43 2014 +0000
+++ b/external/bsd/atf/share/xml/atf/Makefile   Sat Feb 08 19:15:33 2014 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2014/02/08 19:15:34 jmmv Exp $
 
 .include <bsd.own.mk>
 
 .if ${MKSHARE} != "no"
 SRCDIR=                ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH:         ${SRCDIR}/atf-report
+.PATH:         ${SRCDIR}/tools
 
 FILESDIR=      /usr/share/xml/atf
 FILESMODE=     444
diff -r 581c533fcce0 -r 5361e7ddf68c external/bsd/atf/share/xsl/atf/Makefile
--- a/external/bsd/atf/share/xsl/atf/Makefile   Sat Feb 08 19:13:43 2014 +0000
+++ b/external/bsd/atf/share/xsl/atf/Makefile   Sat Feb 08 19:15:33 2014 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2014/02/08 19:15:34 jmmv Exp $
 
 .include <bsd.own.mk>
 
 .if ${MKSHARE} != "no"
 SRCDIR=                ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH:         ${SRCDIR}/atf-report
+.PATH:         ${SRCDIR}/tools
 
 FILESDIR=      /usr/share/xsl/atf
 FILESMODE=     444
diff -r 581c533fcce0 -r 5361e7ddf68c external/bsd/atf/tests/atf/Makefile
--- a/external/bsd/atf/tests/atf/Makefile       Sat Feb 08 19:13:43 2014 +0000
+++ b/external/bsd/atf/tests/atf/Makefile       Sat Feb 08 19:15:33 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/02/25 00:22:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2014/02/08 19:15:34 jmmv Exp $
 
 .include <bsd.own.mk>
 
@@ -10,9 +10,7 @@
                test-programs
 
 .if !(${MKKYUA} != "no")
-TESTS_SUBDIRS+=        atf-config \
-               atf-report \
-               atf-run
+TESTS_SUBDIRS+=        tools
 .endif
 
 SRCDIR=                ${NETBSDSRCDIR}/external/bsd/atf/dist
diff -r 581c533fcce0 -r 5361e7ddf68c external/bsd/atf/tests/atf/atf-c++/Makefile
--- a/external/bsd/atf/tests/atf/atf-c++/Makefile       Sat Feb 08 19:13:43 2014 +0000
+++ b/external/bsd/atf/tests/atf/atf-c++/Makefile       Sat Feb 08 19:15:33 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/07/11 22:40:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2014/02/08 19:15:34 jmmv Exp $
 
 .include <bsd.own.mk>
 
@@ -12,7 +12,7 @@
 .PATH:         ${SRCDIR}/atf-c++/detail
 
 CPPFLAGS+=     -DHAVE_CONFIG_H
-CPPFLAGS+=     -I${NETBSDSRCDIR}/lib/libatf-c++
+CPPFLAGS+=     -I${SRCDIR:H}/lib/libatf-c  # For bconfig.h.
 
 FILESDIR=      ${TESTSDIR}
 FILES=         macros_hpp_test.cpp
diff -r 581c533fcce0 -r 5361e7ddf68c external/bsd/atf/tests/atf/atf-c++/detail/Makefile
--- a/external/bsd/atf/tests/atf/atf-c++/detail/Makefile        Sat Feb 08 19:13:43 2014 +0000
+++ b/external/bsd/atf/tests/atf/atf-c++/detail/Makefile        Sat Feb 08 19:15:33 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/02/15 17:08:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2014/02/08 19:15:34 jmmv Exp $
 
 .include <bsd.own.mk>
 
@@ -9,20 +9,25 @@
 .PATH:         ${SRCDIR}/atf-c++/detail