Author: jmmv
Date: Sun May 25 12:01:13 2014
New Revision: 266650
URL: http://svnweb.freebsd.org/changeset/base/266650
Log:
Change libatf-c and libatf-c++ to be private libraries.
We should not be leaking these interfaces to the outside world given
that it's much easier for third-party components to use the devel/atf
package from ports.
As a side-effect, we can also drop the ATF pkgconfig and aclocal files
from the base system. Nothing in the base system needs these, and it
was quite ugly to have to get them installed only so that a few ports
could build. The offending ports have been fixed to depend on
devel/atf explicitly.
Reviewed by: bapt
Deleted:
head/contrib/atf/atf-c++/atf-c++.m4
head/contrib/atf/atf-c++/atf-c++.pc.in
head/contrib/atf/atf-c/atf-c.m4
head/contrib/atf/atf-c/atf-c.pc.in
head/contrib/atf/atf-c/atf-common.m4
head/contrib/atf/atf-sh/atf-sh.m4
head/contrib/atf/atf-sh/atf-sh.pc.in
Modified:
head/contrib/atf/FREEBSD-Xlist
head/etc/mtree/BSD.tests.dist
head/lib/atf/libatf-c++/Makefile
head/lib/atf/libatf-c++/tests/Makefile
head/lib/atf/libatf-c/Makefile
head/lib/atf/libatf-c/tests/Makefile
head/libexec/atf/atf-check/Makefile
head/share/mk/atf.test.mk
head/share/mk/bsd.libnames.mk
head/tools/build/mk/OptionalObsoleteFiles.inc
head/usr.bin/atf/atf-sh/Makefile
Modified: head/contrib/atf/FREEBSD-Xlist
==============================================================================
--- head/contrib/atf/FREEBSD-Xlist Sun May 25 10:56:45 2014 (r266649)
+++ head/contrib/atf/FREEBSD-Xlist Sun May 25 12:01:13 2014 (r266650)
@@ -2,6 +2,8 @@
*/*/Makefile*
*/Atffile
*/Makefile*
+*/*.m4
+*/*.pc.in
Atffile
INSTALL
Makefile*
Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist Sun May 25 10:56:45 2014 (r266649)
+++ head/etc/mtree/BSD.tests.dist Sun May 25 12:01:13 2014 (r266650)
@@ -12,8 +12,6 @@
..
..
share
- aclocal
- ..
atf
..
doc
Modified: head/lib/atf/libatf-c++/Makefile
==============================================================================
--- head/lib/atf/libatf-c++/Makefile Sun May 25 10:56:45 2014 (r266649)
+++ head/lib/atf/libatf-c++/Makefile Sun May 25 12:01:13 2014 (r266650)
@@ -29,6 +29,7 @@
.include <bsd.init.mk>
LIB= atf-c++
+PRIVATELIB= true
SHLIB_MAJOR= 2
# libatf-c++ depends on the C version of the ATF library to build.
@@ -73,20 +74,6 @@ INCSDIR_atf-c++.hpp= ${INCLUDEDIR}
MAN= atf-c++-api.3
-all: atf-c++.pc
-atf-c++.pc: atf-c++.pc.in atf-version
- sed -e 's,__CXX__,${CXX},g' \
- -e 's,__INCLUDEDIR__,${INCLUDEDIR},g' \
- -e 's,__LIBDIR__,${LIBDIR},g' \
- -e "s,__ATF_VERSION__,$$(cat atf-version),g" \
- <${ATF}/atf-c++/atf-c++.pc.in >atf-c++.pc
-
-beforeinstall:
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- atf-c++.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
- ${INSTALL} -C -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
- ${ATF}/atf-c++/atf-c++.m4 ${DESTDIR}${SHAREDIR}/aclocal
-
.if ${MK_TESTS} != "no"
SUBDIR= tests
.endif
Modified: head/lib/atf/libatf-c++/tests/Makefile
==============================================================================
--- head/lib/atf/libatf-c++/tests/Makefile Sun May 25 10:56:45 2014 (r266649)
+++ head/lib/atf/libatf-c++/tests/Makefile Sun May 25 12:01:13 2014 (r266650)
@@ -26,6 +26,4 @@ ATF_TESTS_CXX+= ${_T}
SRCS.${_T}= ${_T}.cpp test_helpers.cpp
.endfor
-ATF_TESTS_SH= pkg_config_test
-
.include <bsd.test.mk>
Modified: head/lib/atf/libatf-c/Makefile
==============================================================================
--- head/lib/atf/libatf-c/Makefile Sun May 25 10:56:45 2014 (r266649)
+++ head/lib/atf/libatf-c/Makefile Sun May 25 12:01:13 2014 (r266650)
@@ -29,6 +29,7 @@
.include <bsd.init.mk>
LIB= atf-c
+PRIVATELIB= true
SHLIB_MAJOR= 1
ATF= ${.CURDIR:H:H:H}/contrib/atf
@@ -75,22 +76,6 @@ INCSDIR_atf-c.h= ${INCLUDEDIR}
MAN= atf-c-api.3
-all: atf-c.pc
-atf-c.pc: atf-c.pc.in atf-version
- sed -e 's,__CC__,${CC},g' \
- -e 's,__INCLUDEDIR__,${INCLUDEDIR},g' \
- -e 's,__LIBDIR__,${LIBDIR},g' \
- -e "s,__ATF_VERSION__,$$(cat atf-version),g" \
- <${ATF}/atf-c/atf-c.pc.in >atf-c.pc
-
-beforeinstall:
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- atf-c.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
- ${INSTALL} -C -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
- ${ATF}/atf-c/atf-common.m4 ${DESTDIR}${SHAREDIR}/aclocal
- ${INSTALL} -C -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
- ${ATF}/atf-c/atf-c.m4 ${DESTDIR}${SHAREDIR}/aclocal
-
.if ${MK_TESTS} != "no"
SUBDIR= tests
.endif
Modified: head/lib/atf/libatf-c/tests/Makefile
==============================================================================
--- head/lib/atf/libatf-c/tests/Makefile Sun May 25 10:56:45 2014 (r266649)
+++ head/lib/atf/libatf-c/tests/Makefile Sun May 25 12:01:13 2014 (r266650)
@@ -33,6 +33,4 @@ ATF_TESTS_C+= ${_T}
SRCS.${_T}= ${_T}.c test_helpers.c
.endfor
-ATF_TESTS_SH= pkg_config_test
-
.include <bsd.test.mk>
Modified: head/libexec/atf/atf-check/Makefile
==============================================================================
--- head/libexec/atf/atf-check/Makefile Sun May 25 10:56:45 2014 (r266649)
+++ head/libexec/atf/atf-check/Makefile Sun May 25 12:01:13 2014 (r266650)
@@ -38,11 +38,11 @@ MAN= atf-check.1
CFLAGS+= -I${ATF}
-DPADD+= ${LIBATF_CXX} ${LIBATF_C}
-
LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c++
LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c
+DPADD+= ${LIBATF_CXX} ${LIBATF_C}
LDADD+= -latf-c++ -latf-c
+USEPRIVATELIB= atf-c++ atf-c
.if ${MK_TESTS} != "no"
SUBDIR+= tests
Modified: head/share/mk/atf.test.mk
==============================================================================
--- head/share/mk/atf.test.mk Sun May 25 10:56:45 2014 (r266649)
+++ head/share/mk/atf.test.mk Sun May 25 12:01:13 2014 (r266650)
@@ -72,6 +72,7 @@ MAN.${_T}?= # empty
SRCS.${_T}?= ${_T}.c
DPADD.${_T}+= ${LIBATF_C}
LDADD.${_T}+= -latf-c
+USEPRIVATELIB+= atf-c
TEST_INTERFACE.${_T}= atf
.endfor
.endif
@@ -85,6 +86,7 @@ MAN.${_T}?= # empty
SRCS.${_T}?= ${_T}${CXX_SUFFIX:U.cc}
DPADD.${_T}+= ${LIBATF_CXX} ${LIBATF_C}
LDADD.${_T}+= -latf-c++ -latf-c
+USEPRIVATELIB+= atf-c++
TEST_INTERFACE.${_T}= atf
.endfor
.endif
Modified: head/share/mk/bsd.libnames.mk
==============================================================================
--- head/share/mk/bsd.libnames.mk Sun May 25 10:56:45 2014 (r266649)
+++ head/share/mk/bsd.libnames.mk Sun May 25 12:01:13 2014 (r266650)
@@ -13,8 +13,8 @@ LIBCRT0?= ${DESTDIR}${LIBDIR}/crt0.o
LIBALIAS?= ${DESTDIR}${LIBDIR}/libalias.a
LIBARCHIVE?= ${DESTDIR}${LIBDIR}/libarchive.a
LIBASN1?= ${DESTDIR}${LIBDIR}/libasn1.a
-LIBATF_C?= ${DESTDIR}${LIBDIR}/libatf-c.a
-LIBATF_CXX?= ${DESTDIR}${LIBDIR}/libatf-c++.a
+LIBATF_C?= ${DESTDIR}${LIBPRIVATEDIR}/libatf-c.a
+LIBATF_CXX?= ${DESTDIR}${LIBPRIVATEDIR}/libatf-c++.a
LIBATM?= ${DESTDIR}${LIBDIR}/libatm.a
LIBAUDITD?= ${DESTDIR}${LIBDIR}/libauditd.a
LIBAVL?= ${DESTDIR}${LIBDIR}/libavl.a
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sun May 25 10:56:45 2014 (r266649)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun May 25 12:01:13 2014 (r266650)
@@ -4103,7 +4103,34 @@ OLD_FILES+=usr/share/man/man8/telnetd.8.
.endif
.if ${MK_TESTS} == yes
+OLD_LIBS+=usr/lib/libatf-c++.a
+OLD_LIBS+=usr/lib/libatf-c++.so
OLD_LIBS+=usr/lib/libatf-c++.so.1
+OLD_LIBS+=usr/lib/libatf-c++.so.2
+OLD_LIBS+=usr/lib/libatf-c++_p.a
+OLD_LIBS+=usr/lib/libatf-c.a
+OLD_LIBS+=usr/lib/libatf-c.so
+OLD_LIBS+=usr/lib/libatf-c.so.1
+OLD_LIBS+=usr/lib/libatf-c_p.a
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
+OLD_LIBS+=usr/lib32/libatf-c++.a
+OLD_LIBS+=usr/lib32/libatf-c++.so
+OLD_LIBS+=usr/lib32/libatf-c++.so.1
+OLD_LIBS+=usr/lib32/libatf-c++.so.2
+OLD_LIBS+=usr/lib32/libatf-c++_p.a
+OLD_LIBS+=usr/lib32/libatf-c.a
+OLD_LIBS+=usr/lib32/libatf-c.so
+OLD_LIBS+=usr/lib32/libatf-c.so.1
+OLD_LIBS+=usr/lib32/libatf-c_p.a
+.endif
+OLD_FILES+=usr/libdata/pkgconfig/atf-c++.pc
+OLD_FILES+=usr/libdata/pkgconfig/atf-c.pc
+OLD_FILES+=usr/libdata/pkgconfig/atf-sh.pc
+OLD_FILES+=usr/share/aclocal/atf-c++.m4
+OLD_FILES+=usr/share/aclocal/atf-c.m4
+OLD_FILES+=usr/share/aclocal/atf-common.m4
+OLD_FILES+=usr/share/aclocal/atf-sh.m4
+OLD_DIRS+=usr/share/aclocal
OLD_FILES+=usr/tests/lib/atf/libatf-c/test_helpers_test
OLD_FILES+=usr/tests/lib/atf/test-programs/fork_test
OLD_FILES+=usr/tests/lib/atf/libatf-c++/application_test
@@ -4117,6 +4144,7 @@ OLD_FILES+=usr/tests/lib/atf/libatf-c++/
OLD_FILES+=usr/tests/lib/atf/libatf-c++/parser_test
OLD_FILES+=usr/tests/lib/atf/libatf-c++/process_test
OLD_FILES+=usr/tests/lib/atf/libatf-c++/sanity_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c++/pkg_config_test
OLD_FILES+=usr/tests/lib/atf/libatf-c++/text_test
OLD_FILES+=usr/tests/lib/atf/libatf-c++/ui_test
OLD_FILES+=usr/tests/lib/atf/libatf-c/dynstr_test
@@ -4124,6 +4152,7 @@ OLD_FILES+=usr/tests/lib/atf/libatf-c/en
OLD_FILES+=usr/tests/lib/atf/libatf-c/fs_test
OLD_FILES+=usr/tests/lib/atf/libatf-c/list_test
OLD_FILES+=usr/tests/lib/atf/libatf-c/map_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c/pkg_config_test
OLD_FILES+=usr/tests/lib/atf/libatf-c/process_helpers
OLD_FILES+=usr/tests/lib/atf/libatf-c/process_test
OLD_FILES+=usr/tests/lib/atf/libatf-c/sanity_test
Modified: head/usr.bin/atf/atf-sh/Makefile
==============================================================================
--- head/usr.bin/atf/atf-sh/Makefile Sun May 25 10:56:45 2014 (r266649)
+++ head/usr.bin/atf/atf-sh/Makefile Sun May 25 12:01:13 2014 (r266650)
@@ -40,24 +40,13 @@ CFLAGS+= -I${ATF}
DPADD+= ${LIBATF_C} ${LIBATF_CXX}
LDADD+= -latf-c++ -latf-c
+USEPRIVATELIB= atf-c++ atf-c
FILESGROUPS= SUBR
SUBRDIR= ${SHAREDIR}/atf
SUBR= libatf-sh.subr
-all: atf-sh.pc
-atf-sh.pc: atf-sh.pc.in atf-version
- sed -e 's,__EXEC_PREFIX__,/usr,g' \
- -e "s,__ATF_VERSION__,$$(cat atf-version),g" \
- <${ATF}/atf-sh/atf-sh.pc.in >atf-sh.pc
-
-beforeinstall:
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- atf-sh.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
- ${INSTALL} -C -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
- ${ATF}/atf-sh/atf-sh.m4 ${DESTDIR}${SHAREDIR}/aclocal
-
.if ${MK_TESTS} != "no"
SUBDIR+= tests
.endif