Module Name: src
Committed By: jmmv
Date: Sun Mar 2 22:50:13 UTC 2014
Modified Files:
src/external/bsd/atf/dist/tools: atf-version.cpp
src/external/bsd/atf/lib/libatf-c: Makefile
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/usr.bin/atf-sh: Makefile
src/external/bsd/atf/usr.bin/atf-version: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/dist/tools/atf-version.cpp
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/atf/usr.bin/atf-sh/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/atf/usr.bin/atf-version/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/tools/atf-version.cpp
diff -u src/external/bsd/atf/dist/tools/atf-version.cpp:1.5 src/external/bsd/atf/dist/tools/atf-version.cpp:1.6
--- src/external/bsd/atf/dist/tools/atf-version.cpp:1.5 Tue Feb 11 18:07:30 2014
+++ src/external/bsd/atf/dist/tools/atf-version.cpp Sun Mar 2 22:50:13 2014
@@ -31,6 +31,7 @@
#include <iostream>
#include "application.hpp"
+#include "version.hpp"
class atf_version : public tools::application::app {
static const char* m_description;
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.20 src/external/bsd/atf/lib/libatf-c/Makefile:1.21
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.20 Sat Feb 15 04:19:46 2014
+++ src/external/bsd/atf/lib/libatf-c/Makefile Sun Mar 2 22:50:13 2014
@@ -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 @@ FILESDIR= /usr/lib/pkgconfig
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' \
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.23 src/external/bsd/atf/lib/libatf-c++/Makefile:1.24
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.23 Sat Feb 15 04:19:46 2014
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Sun Mar 2 22:50:13 2014
@@ -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 @@ FILESDIR= /usr/lib/pkgconfig
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' \
Index: src/external/bsd/atf/usr.bin/atf-sh/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.11 src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.12
--- src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.11 Sat Feb 15 04:19:46 2014
+++ src/external/bsd/atf/usr.bin/atf-sh/Makefile Sun Mar 2 22:50:13 2014
@@ -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 @@ FILESDIR_atf-sh.pc= /usr/lib/pkgconfig
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
Index: src/external/bsd/atf/usr.bin/atf-version/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-version/Makefile:1.12 src/external/bsd/atf/usr.bin/atf-version/Makefile:1.13
--- src/external/bsd/atf/usr.bin/atf-version/Makefile:1.12 Sat Feb 15 04:19:46 2014
+++ src/external/bsd/atf/usr.bin/atf-version/Makefile Sun Mar 2 22:50:13 2014
@@ -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 @@ SRCS= atf-version.cpp
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>
