Module Name: src
Committed By: jmmv
Date: Wed Jul 11 22:40:16 UTC 2012
Modified Files:
src/external/bsd/atf/lib/libatf-c: Makefile bconfig.h
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/tests/atf/atf-c: Makefile
src/external/bsd/atf/tests/atf/atf-c++: Makefile
src/external/bsd/atf/usr.bin/atf-sh: Makefile
Added Files:
src/external/bsd/atf/lib/libatf-c: shlib_version
src/external/bsd/atf/lib/libatf-c++: shlib_version
Log Message:
Update reachover Makefiles for atf 0.16.
As part of this change (and as done upstream and in various packaging
systems), start shipping shared libraries of both libatf-c and libatf-c++.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/atf/lib/libatf-c/bconfig.h
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/lib/libatf-c/shlib_version
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/lib/libatf-c++/shlib_version
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/tests/atf/atf-c/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/tests/atf/atf-c++/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/usr.bin/atf-sh/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/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.14 src/external/bsd/atf/lib/libatf-c/Makefile:1.15
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.14 Mon Jan 16 22:42:40 2012
+++ src/external/bsd/atf/lib/libatf-c/Makefile Wed Jul 11 22:40:16 2012
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2012/01/16 22:42:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2012/07/11 22:40:16 jmmv Exp $
NOLINT= # defined
.include <bsd.own.mk>
LIB= atf-c
-NOPIC= # defined; interface is still too unstable
CWARNFLAGS+= -Wno-missing-noreturn
@@ -90,7 +89,7 @@ FILESDIR= /usr/lib/pkgconfig
realall: atf-c.pc
atf-c.pc: Makefile atf-c.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.15,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.16,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/bconfig.h
diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.10 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.11
--- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.10 Mon Jan 16 22:42:40 2012
+++ src/external/bsd/atf/lib/libatf-c/bconfig.h Wed Jul 11 22:40:16 2012
@@ -96,19 +96,19 @@
#define PACKAGE_NAME "Automated Testing Framework"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Automated Testing Framework 0.15"
+#define PACKAGE_STRING "Automated Testing Framework 0.16"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "atf"
/* Define to the home page for this package. */
-#define PACKAGE_URL "http://www.NetBSD.org/~jmmv/atf/";
+#define PACKAGE_URL "http://code.google.com/p/kyua/wiki/ATF";
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.15"
+#define PACKAGE_VERSION "0.16"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.15"
+#define VERSION "0.16"
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.12 src/external/bsd/atf/lib/libatf-c++/Makefile:1.13
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.12 Mon Jan 16 22:42:40 2012
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Wed Jul 11 22:40:16 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/01/16 22:42:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2012/07/11 22:40:16 jmmv Exp $
NOLINT= # defined
@@ -8,7 +8,6 @@ LIB= atf-c++
LIBISCXX= yes
LDADD= -L${.OBJDIR}/../libatf-c -latf-c
DPADD= ${LIBATF_C}
-NOPIC= # defined; interface is still too unstable
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}
@@ -55,7 +54,7 @@ FILESDIR= /usr/lib/pkgconfig
realall: atf-c++.pc
atf-c++.pc: Makefile atf-c++.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.15,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.16,g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/tests/atf/atf-c/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c/Makefile:1.7 src/external/bsd/atf/tests/atf/atf-c/Makefile:1.8
--- src/external/bsd/atf/tests/atf/atf-c/Makefile:1.7 Wed Oct 20 09:20:10 2010
+++ src/external/bsd/atf/tests/atf/atf-c/Makefile Wed Jul 11 22:40:16 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/10/20 09:20:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2012/07/11 22:40:16 jmmv Exp $
.include <bsd.own.mk>
@@ -16,6 +16,7 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/external/bs
FILESDIR= ${TESTSDIR}
FILES= macros_h_test.c
+FILES+= unused_test.c
TESTS_C=
.for test in atf_c_test \
Index: src/external/bsd/atf/tests/atf/atf-c++/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.6 src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.7
--- src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.6 Wed Oct 20 09:20:11 2010
+++ src/external/bsd/atf/tests/atf/atf-c++/Makefile Wed Jul 11 22:40:16 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/10/20 09:20:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2012/07/11 22:40:16 jmmv Exp $
.include <bsd.own.mk>
@@ -16,6 +16,7 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libatf-
FILESDIR= ${TESTSDIR}
FILES= macros_hpp_test.cpp
+FILES+= unused_test.cpp
TESTS_CXX=
.for test in atf_c++_test \
Index: src/external/bsd/atf/usr.bin/atf-sh/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.6 src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.7
--- src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.6 Mon Jan 16 22:42:40 2012
+++ src/external/bsd/atf/usr.bin/atf-sh/Makefile Wed Jul 11 22:40:16 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/01/16 22:42:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2012/07/11 22:40:16 jmmv Exp $
.include <bsd.own.mk>
@@ -29,7 +29,7 @@ FILESDIR_atf-sh.pc= /usr/lib/pkgconfig
realall: atf-sh.pc
atf-sh.pc: Makefile atf-sh.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.15,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.16,g' \
-e 's,__EXEC_PREFIX__,/usr,g' \
<${SRCDIR}/atf-sh/atf-sh.pc.in >atf-sh.pc
CLEANFILES+= atf-sh.pc
Added files:
Index: src/external/bsd/atf/lib/libatf-c/shlib_version
diff -u /dev/null src/external/bsd/atf/lib/libatf-c/shlib_version:1.1
--- /dev/null Wed Jul 11 22:40:16 2012
+++ src/external/bsd/atf/lib/libatf-c/shlib_version Wed Jul 11 22:40:16 2012
@@ -0,0 +1,3 @@
+# $NetBSD: shlib_version,v 1.1 2012/07/11 22:40:16 jmmv Exp $
+major=0
+minor=0
Index: src/external/bsd/atf/lib/libatf-c++/shlib_version
diff -u /dev/null src/external/bsd/atf/lib/libatf-c++/shlib_version:1.1
--- /dev/null Wed Jul 11 22:40:17 2012
+++ src/external/bsd/atf/lib/libatf-c++/shlib_version Wed Jul 11 22:40:16 2012
@@ -0,0 +1,3 @@
+# $NetBSD: shlib_version,v 1.1 2012/07/11 22:40:16 jmmv Exp $
+major=0
+minor=0
