From 17a286a994dfed65f6b22e7bbb49f5636c5644aa Mon Sep 17 00:00:00 2001 From: Julio Merino Date: Sun, 25 May 2014 12:01:13 +0000 Subject: [PATCH] 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 --- contrib/atf/FREEBSD-Xlist | 2 + contrib/atf/atf-c++/atf-c++.m4 | 48 ------------- contrib/atf/atf-c++/atf-c++.pc.in | 11 --- contrib/atf/atf-c/atf-c.m4 | 48 ------------- contrib/atf/atf-c/atf-c.pc.in | 11 --- contrib/atf/atf-c/atf-common.m4 | 92 ------------------------ contrib/atf/atf-sh/atf-sh.m4 | 53 -------------- contrib/atf/atf-sh/atf-sh.pc.in | 8 --- etc/mtree/BSD.tests.dist | 2 - lib/atf/libatf-c++/Makefile | 15 +--- lib/atf/libatf-c++/tests/Makefile | 2 - lib/atf/libatf-c/Makefile | 17 +---- lib/atf/libatf-c/tests/Makefile | 2 - libexec/atf/atf-check/Makefile | 4 +- share/mk/atf.test.mk | 2 + share/mk/bsd.libnames.mk | 4 +- tools/build/mk/OptionalObsoleteFiles.inc | 29 ++++++++ usr.bin/atf/atf-sh/Makefile | 13 +--- 18 files changed, 40 insertions(+), 323 deletions(-) delete mode 100644 contrib/atf/atf-c++/atf-c++.m4 delete mode 100644 contrib/atf/atf-c++/atf-c++.pc.in delete mode 100644 contrib/atf/atf-c/atf-c.m4 delete mode 100644 contrib/atf/atf-c/atf-c.pc.in delete mode 100644 contrib/atf/atf-c/atf-common.m4 delete mode 100644 contrib/atf/atf-sh/atf-sh.m4 delete mode 100644 contrib/atf/atf-sh/atf-sh.pc.in diff --git a/contrib/atf/FREEBSD-Xlist b/contrib/atf/FREEBSD-Xlist index bcc8a4bacf23..5af9ed5e9aac 100644 --- a/contrib/atf/FREEBSD-Xlist +++ b/contrib/atf/FREEBSD-Xlist @@ -2,6 +2,8 @@ */*/Makefile* */Atffile */Makefile* +*/*.m4 +*/*.pc.in Atffile INSTALL Makefile* diff --git a/contrib/atf/atf-c++/atf-c++.m4 b/contrib/atf/atf-c++/atf-c++.m4 deleted file mode 100644 index 0763d04865bc..000000000000 --- a/contrib/atf/atf-c++/atf-c++.m4 +++ /dev/null @@ -1,48 +0,0 @@ -dnl -dnl Automated Testing Framework (atf) -dnl -dnl Copyright 2011 Google Inc. -dnl All rights reserved. -dnl -dnl Redistribution and use in source and binary forms, with or without -dnl modification, are permitted provided that the following conditions are -dnl met: -dnl -dnl * Redistributions of source code must retain the above copyright -dnl notice, this list of conditions and the following disclaimer. -dnl * Redistributions in binary form must reproduce the above copyright -dnl notice, this list of conditions and the following disclaimer in the -dnl documentation and/or other materials provided with the distribution. -dnl * Neither the name of Google Inc. nor the names of its contributors -dnl may be used to endorse or promote products derived from this software -dnl without specific prior written permission. -dnl -dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -dnl "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -dnl LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -dnl A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -dnl OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -dnl SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -dnl LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -dnl DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -dnl THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -dnl (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -dnl - -dnl ATF_CHECK_CXX([version-spec]) -dnl -dnl Checks if atf-c++ is present. If version-spec is provided, ensures that -dnl the installed version of atf-sh matches the required version. This -dnl argument must be something like '>= 0.14' and accepts any version -dnl specification supported by pkg-config. -dnl -dnl Defines and substitutes ATF_CXX_CFLAGS and ATF_CXX_LIBS with the compiler -dnl and linker flags need to build against atf-c++. -AC_DEFUN([ATF_CHECK_CXX], [ - spec="atf-c++[]m4_default_nblank([ $1], [])" - _ATF_CHECK_ARG_WITH( - [PKG_CHECK_MODULES([ATF_CXX], [${spec}], - [found=yes found_atf_cxx=yes], [found=no])], - [required ${spec} not found]) -]) diff --git a/contrib/atf/atf-c++/atf-c++.pc.in b/contrib/atf/atf-c++/atf-c++.pc.in deleted file mode 100644 index f366bb016d04..000000000000 --- a/contrib/atf/atf-c++/atf-c++.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -# ATF pkg-config file - -cxx=__CXX__ -includedir=__INCLUDEDIR__ -libdir=__LIBDIR__ - -Name: atf-c++ -Description: Automated Testing Framework (C++ binding) -Version: __ATF_VERSION__ -Cflags: -I${includedir} -Libs: -L${libdir} -latf-c++ -latf-c diff --git a/contrib/atf/atf-c/atf-c.m4 b/contrib/atf/atf-c/atf-c.m4 deleted file mode 100644 index d0237b848206..000000000000 --- a/contrib/atf/atf-c/atf-c.m4 +++ /dev/null @@ -1,48 +0,0 @@ -dnl -dnl Automated Testing Framework (atf) -dnl -dnl Copyright 2011 Google Inc. -dnl All rights reserved. -dnl -dnl Redistribution and use in source and binary forms, with or without -dnl modification, are permitted provided that the following conditions are -dnl met: -dnl -dnl * Redistributions of source code must retain the above copyright -dnl notice, this list of conditions and the following disclaimer. -dnl * Redistributions in binary form must reproduce the above copyright -dnl notice, this list of conditions and the following disclaimer in the -dnl documentation and/or other materials provided with the distribution. -dnl * Neither the name of Google Inc. nor the names of its contributors -dnl may be used to endorse or promote products derived from this software -dnl without specific prior written permission. -dnl -dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -dnl "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -dnl LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -dnl A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -dnl OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -dnl SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -dnl LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -dnl DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -dnl THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -dnl (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -dnl - -dnl ATF_CHECK_C([version-spec]) -dnl -dnl Checks if atf-c is present. If version-spec is provided, ensures that -dnl the installed version of atf-sh matches the required version. This -dnl argument must be something like '>= 0.14' and accepts any version -dnl specification supported by pkg-config. -dnl -dnl Defines and substitutes ATF_C_CFLAGS and ATF_C_LIBS with the compiler -dnl and linker flags need to build against atf-c. -AC_DEFUN([ATF_CHECK_C], [ - spec="atf-c[]m4_default_nblank([ $1], [])" - _ATF_CHECK_ARG_WITH( - [PKG_CHECK_MODULES([ATF_C], [${spec}], - [found=yes found_atf_c=yes], [found=no])], - [required ${spec} not found]) -]) diff --git a/contrib/atf/atf-c/atf-c.pc.in b/contrib/atf/atf-c/atf-c.pc.in deleted file mode 100644 index 6fd52740b791..000000000000 --- a/contrib/atf/atf-c/atf-c.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -# ATF pkg-config file - -cc=__CC__ -includedir=__INCLUDEDIR__ -libdir=__LIBDIR__ - -Name: atf-c -Description: Automated Testing Framework (C binding) -Version: __ATF_VERSION__ -Cflags: -I${includedir} -Libs: -L${libdir} -latf-c diff --git a/contrib/atf/atf-c/atf-common.m4 b/contrib/atf/atf-c/atf-common.m4 deleted file mode 100644 index 464a5a7fa007..000000000000 --- a/contrib/atf/atf-c/atf-common.m4 +++ /dev/null @@ -1,92 +0,0 @@ -dnl -dnl Automated Testing Framework (atf) -dnl -dnl Copyright 2011 Google Inc. -dnl All rights reserved. -dnl -dnl Redistribution and use in source and binary forms, with or without -dnl modification, are permitted provided that the following conditions are -dnl met: -dnl -dnl * Redistributions of source code must retain the above copyright -dnl notice, this list of conditions and the following disclaimer. -dnl * Redistributions in binary form must reproduce the above copyright -dnl notice, this list of conditions and the following disclaimer in the -dnl documentation and/or other materials provided with the distribution. -dnl * Neither the name of Google Inc. nor the names of its contributors -dnl may be used to endorse or promote products derived from this software -dnl without specific prior written permission. -dnl -dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -dnl "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -dnl LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -dnl A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -dnl OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -dnl SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -dnl LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -dnl DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -dnl THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -dnl (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -dnl - -dnl ATF_ARG_WITH -dnl -dnl Adds a --with-atf flag to the configure script that allows the user to -dnl enable or disable atf support. -dnl -dnl The ATF_CHECK_{C,CXX,SH} macros honor the flag defined herein if -dnl instantiated. If not instantiated, they will request the presence of -dnl the libraries unconditionally. -dnl -dnl Defines the WITH_ATF Automake conditional if ATF has been found by any -dnl of the ATF_CHECK_{C,CXX,SH} macros. -AC_DEFUN([ATF_ARG_WITH], [ - m4_define([atf_arg_with_called], [yes]) - - m4_divert_text([DEFAULTS], [with_atf=auto]) - AC_ARG_WITH([atf], - [AS_HELP_STRING([--with-atf=], - [build atf-based test programs])], - [with_atf=${withval}], [with_atf=auto]) - - m4_divert_text([DEFAULTS], [ - found_atf_c=no - found_atf_cxx=no - found_atf_sh=no - ]) - AM_CONDITIONAL([WITH_ATF], [test x"${found_atf_c}" = x"yes" -o \ - x"${found_atf_cxx}" = x"yes" -o \ - x"${found_atf_sh}" = x"yes"]) -]) - -dnl _ATF_CHECK_ARG_WITH(check, error_message) -dnl -dnl Internal macro to execute a check conditional on the --with-atf flag -dnl and handle the result accordingly. -dnl -dnl 'check' specifies the piece of code to be run to detect the feature. -dnl This code must set the 'found' shell variable to yes or no depending -dnl on the raw result of the check. -AC_DEFUN([_ATF_CHECK_ARG_WITH], [ - m4_ifdef([atf_arg_with_called], [ - m4_fatal([ATF_ARG_WITH must be called after the ATF_CHECK_* checks]) - ]) - - m4_divert_text([DEFAULTS], [with_atf=yes]) - - if test x"${with_atf}" = x"no"; then - _found=no - else - $1 - if test x"${with_atf}" = x"auto"; then - _found="${found}" - else - if test x"${found}" = x"yes"; then - _found=yes - else - AC_MSG_ERROR([$2]) - fi - fi - fi -]) diff --git a/contrib/atf/atf-sh/atf-sh.m4 b/contrib/atf/atf-sh/atf-sh.m4 deleted file mode 100644 index 7215d1c7fe43..000000000000 --- a/contrib/atf/atf-sh/atf-sh.m4 +++ /dev/null @@ -1,53 +0,0 @@ -dnl -dnl Automated Testing Framework (atf) -dnl -dnl Copyright 2011 Google Inc. -dnl All rights reserved. -dnl -dnl Redistribution and use in source and binary forms, with or without -dnl modification, are permitted provided that the following conditions are -dnl met: -dnl -dnl * Redistributions of source code must retain the above copyright -dnl notice, this list of conditions and the following disclaimer. -dnl * Redistributions in binary form must reproduce the above copyright -dnl notice, this list of conditions and the following disclaimer in the -dnl documentation and/or other materials provided with the distribution. -dnl * Neither the name of Google Inc. nor the names of its contributors -dnl may be used to endorse or promote products derived from this software -dnl without specific prior written permission. -dnl -dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -dnl "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -dnl LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -dnl A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -dnl OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -dnl SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -dnl LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -dnl DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -dnl THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -dnl (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -dnl - -dnl ATF_CHECK_SH([version-spec]) -dnl -dnl Checks if atf-sh is present. If version-spec is provided, ensures that -dnl the installed version of atf-sh matches the required version. This -dnl argument must be something like '>= 0.14' and accepts any version -dnl specification supported by pkg-config. -dnl -dnl Defines and substitutes ATF_SH with the full path to the atf-sh interpreter. -AC_DEFUN([ATF_CHECK_SH], [ - spec="atf-sh[]m4_default_nblank([ $1], [])" - _ATF_CHECK_ARG_WITH( - [AC_MSG_CHECKING([for ${spec}]) - PKG_CHECK_EXISTS([${spec}], [found=yes], [found=no]) - if test "${found}" = yes; then - ATF_SH="$(${PKG_CONFIG} --variable=interpreter atf-sh)" - AC_SUBST([ATF_SH], [${ATF_SH}]) - found_atf_sh=yes - fi - AC_MSG_RESULT([${ATF_SH}])], - [required ${spec} not found]) -]) diff --git a/contrib/atf/atf-sh/atf-sh.pc.in b/contrib/atf/atf-sh/atf-sh.pc.in deleted file mode 100644 index 930dc4c3d4cb..000000000000 --- a/contrib/atf/atf-sh/atf-sh.pc.in +++ /dev/null @@ -1,8 +0,0 @@ -# ATF pkg-config file - -exec_prefix=__EXEC_PREFIX__ -interpreter=${exec_prefix}/bin/atf-sh - -Name: atf-sh -Description: Automated Testing Framework (POSIX shell binding) -Version: __ATF_VERSION__ diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 083054eb2748..3124283a0466 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -12,8 +12,6 @@ .. .. share - aclocal - .. atf .. doc diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile index 84477f79927d..121b77d486f7 100644 --- a/lib/atf/libatf-c++/Makefile +++ b/lib/atf/libatf-c++/Makefile @@ -29,6 +29,7 @@ .include 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 diff --git a/lib/atf/libatf-c++/tests/Makefile b/lib/atf/libatf-c++/tests/Makefile index c5a1d2495b6c..56355f295227 100644 --- a/lib/atf/libatf-c++/tests/Makefile +++ b/lib/atf/libatf-c++/tests/Makefile @@ -26,6 +26,4 @@ ATF_TESTS_CXX+= ${_T} SRCS.${_T}= ${_T}.cpp test_helpers.cpp .endfor -ATF_TESTS_SH= pkg_config_test - .include diff --git a/lib/atf/libatf-c/Makefile b/lib/atf/libatf-c/Makefile index 5c607f7b42da..f067ede853fc 100644 --- a/lib/atf/libatf-c/Makefile +++ b/lib/atf/libatf-c/Makefile @@ -29,6 +29,7 @@ .include 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 diff --git a/lib/atf/libatf-c/tests/Makefile b/lib/atf/libatf-c/tests/Makefile index 1a091d3172f6..70ba1a5ca2ca 100644 --- a/lib/atf/libatf-c/tests/Makefile +++ b/lib/atf/libatf-c/tests/Makefile @@ -33,6 +33,4 @@ ATF_TESTS_C+= ${_T} SRCS.${_T}= ${_T}.c test_helpers.c .endfor -ATF_TESTS_SH= pkg_config_test - .include diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile index 093de06ed534..ee4b21a940e6 100644 --- a/libexec/atf/atf-check/Makefile +++ b/libexec/atf/atf-check/Makefile @@ -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 diff --git a/share/mk/atf.test.mk b/share/mk/atf.test.mk index 1be7244acfc5..c82557ce9760 100644 --- a/share/mk/atf.test.mk +++ b/share/mk/atf.test.mk @@ -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 diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 3594b75cff8e..eb0509b4609e 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -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 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index bb166f885280..6645be6ed522 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -4103,7 +4103,34 @@ OLD_FILES+=usr/share/man/man8/telnetd.8.gz .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++/fs_test 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/env_test 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 diff --git a/usr.bin/atf/atf-sh/Makefile b/usr.bin/atf/atf-sh/Makefile index 845521c80420..3f461fdbe9ac 100644 --- a/usr.bin/atf/atf-sh/Makefile +++ b/usr.bin/atf/atf-sh/Makefile @@ -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