[src/trunk]: src/external/bsd/atf Fix bundling of the atf version into pkgcon...

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

details:   https://anonhg.NetBSD.org/src/rev/8fc953908a43
branches:  trunk
changeset: 793985:8fc953908a43
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Sun Mar 02 22:50:13 2014 +0000

description:
Fix bundling of the atf version into pkgconfig files and atf-version.

Sigh; one more attempt.  This time I'm sure I've verified that the
.pc files contain the right number and that atf-version also outputs
the right stuff...  Both with a clean and non-clean obj directory.

Should fix part of the problems reported in PR bin/48624.

diffstat:

 external/bsd/atf/dist/tools/atf-version.cpp   |  1 +
 external/bsd/atf/lib/libatf-c++/Makefile      |  4 ++--
 external/bsd/atf/lib/libatf-c/Makefile        |  4 ++--
 external/bsd/atf/usr.bin/atf-sh/Makefile      |  4 ++--
 external/bsd/atf/usr.bin/atf-version/Makefile |  9 ++++++---
 5 files changed, 13 insertions(+), 9 deletions(-)

diffs (90 lines):

diff -r e579237e784c -r 8fc953908a43 external/bsd/atf/dist/tools/atf-version.cpp
--- a/external/bsd/atf/dist/tools/atf-version.cpp       Sun Mar 02 22:40:45 2014 +0000
+++ b/external/bsd/atf/dist/tools/atf-version.cpp       Sun Mar 02 22:50:13 2014 +0000
@@ -31,6 +31,7 @@
 #include <iostream>
 
 #include "application.hpp"
+#include "version.hpp"
 
 class atf_version : public tools::application::app {
     static const char* m_description;
diff -r e579237e784c -r 8fc953908a43 external/bsd/atf/lib/libatf-c++/Makefile
--- a/external/bsd/atf/lib/libatf-c++/Makefile  Sun Mar 02 22:40:45 2014 +0000
+++ b/external/bsd/atf/lib/libatf-c++/Makefile  Sun Mar 02 22:50:13 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/02/15 04:19:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2014/03/02 22:50:13 jmmv Exp $
 
 NOLINT=                # defined
 
@@ -48,7 +48,7 @@
 
 realall: atf-c++.pc
 atf-c++.pc: Makefile atf-c++.pc.in atf-version.txt
-       ${TOOL_SED} -e 's,__ATF_VERSION__,$$(cat atf-version.txt),g' \
+       ${TOOL_SED} -e "s,__ATF_VERSION__,$$(cat atf-version.txt),g" \
            -e 's,__CXX__,g++,g' \
            -e 's,__INCLUDEDIR__,/usr/include,g' \
            -e 's,__LIBDIR__,/usr/lib,g' \
diff -r e579237e784c -r 8fc953908a43 external/bsd/atf/lib/libatf-c/Makefile
--- a/external/bsd/atf/lib/libatf-c/Makefile    Sun Mar 02 22:40:45 2014 +0000
+++ b/external/bsd/atf/lib/libatf-c/Makefile    Sun Mar 02 22:50:13 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/02/15 04:19:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2014/03/02 22:50:13 jmmv Exp $
 
 NOLINT=                # defined
 
@@ -59,7 +59,7 @@
 
 realall: atf-c.pc
 atf-c.pc: Makefile atf-c.pc.in atf-version.txt
-       ${TOOL_SED} -e 's,__ATF_VERSION__,$$(cat atf-version.txt),g' \
+       ${TOOL_SED} -e "s,__ATF_VERSION__,$$(cat atf-version.txt),g" \
            -e 's,__CC__,gcc,g' \
            -e 's,__INCLUDEDIR__,/usr/include,g' \
            -e 's,__LIBDIR__,/usr/lib,g' \
diff -r e579237e784c -r 8fc953908a43 external/bsd/atf/usr.bin/atf-sh/Makefile
--- a/external/bsd/atf/usr.bin/atf-sh/Makefile  Sun Mar 02 22:40:45 2014 +0000
+++ b/external/bsd/atf/usr.bin/atf-sh/Makefile  Sun Mar 02 22:50:13 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/02/15 04:19:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2014/03/02 22:50:13 jmmv Exp $
 
 .include <bsd.init.mk>
 
@@ -26,7 +26,7 @@
 
 realall: atf-sh.pc
 atf-sh.pc: Makefile atf-sh.pc.in atf-version.txt
-       ${TOOL_SED} -e 's,__ATF_VERSION__,$$(cat atf-version.txt),g' \
+       ${TOOL_SED} -e "s,__ATF_VERSION__,$$(cat atf-version.txt),g" \
            -e 's,__EXEC_PREFIX__,/usr,g' \
            <${SRCDIR}/atf-sh/atf-sh.pc.in >atf-sh.pc
 CLEANFILES+=   atf-sh.pc
diff -r e579237e784c -r 8fc953908a43 external/bsd/atf/usr.bin/atf-version/Makefile
--- a/external/bsd/atf/usr.bin/atf-version/Makefile     Sun Mar 02 22:40:45 2014 +0000
+++ b/external/bsd/atf/usr.bin/atf-version/Makefile     Sun Mar 02 22:50:13 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/02/15 04:19:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2014/03/02 22:50:13 jmmv Exp $
 
 USE_ATF_LIBTOOLS=      yes
 
@@ -12,10 +12,13 @@
 MAN=           atf-version.1
 
 CPPFLAGS+=     -I${SRCDIR}/tools
+CPPFLAGS+=     -I.
 
 WARNS?=                2
 
-CPPFLAGS+=     -DATF_VERSION=\"$(ATF_VERSION)\"
-atf-version.o: atf-version.txt
+DPSRCS+=       version.hpp
+CLEANFILES+=   version.hpp
+version.hpp: Makefile atf-version.txt
+       echo "#define ATF_VERSION \"$$(cat atf-version.txt)\"" >version.hpp
 
 .include <bsd.prog.mk>