svn commit: r270905 - in stable/10: . contrib/atf contrib/atf/atf-c contrib/atf/atf-c++ contrib/atf/atf-sh etc/mtree lib/atf/libatf-c lib/atf/libatf-c++ lib/atf/libatf-c++/tests lib/atf/libatf-c/te...

Garrett Cooper ngie at FreeBSD.org
Sun Aug 31 23:09:26 UTC 2014 

Author: ngie
Date: Sun Aug 31 23:09:23 2014
New Revision: 270905
URL: http://svnweb.freebsd.org/changeset/base/270905

Log:
  MFC r266650, r267172 (both by jmmv):
  
  r266650:
  
    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
  
  r267172:
  
    Homogenize libatf-* version numbers with upstream.
  
    The libatf-* major version numbers in FreeBSD were one version ahead of
    upstream because, when atf was first imported into FreeBSD, the upstream
    numbers were not respected.  This is just confusing and bound to cause
    problems down the road.
  
    Fix this by taking advantage of the fact that libatf-* are now private
    and that atf is not yet built by default.  However, and unfortunately, a
    clean build is needed for tests to continue working once "make
    delete-old-libs" has been run; hence the note in UPDATING.
  
  Phabric: D701
  Approved by: jmmv (maintainer, mentor)

Deleted:
  stable/10/contrib/atf/atf-c++/atf-c++.m4
  stable/10/contrib/atf/atf-c++/atf-c++.pc.in
  stable/10/contrib/atf/atf-c/atf-c.m4
  stable/10/contrib/atf/atf-c/atf-c.pc.in
  stable/10/contrib/atf/atf-c/atf-common.m4
  stable/10/contrib/atf/atf-sh/atf-sh.m4
  stable/10/contrib/atf/atf-sh/atf-sh.pc.in
Modified:
  stable/10/UPDATING
  stable/10/contrib/atf/FREEBSD-Xlist
  stable/10/etc/mtree/BSD.tests.dist
  stable/10/lib/atf/libatf-c++/Makefile
  stable/10/lib/atf/libatf-c++/tests/Makefile
  stable/10/lib/atf/libatf-c/Makefile
  stable/10/lib/atf/libatf-c/tests/Makefile
  stable/10/libexec/atf/atf-check/Makefile
  stable/10/share/mk/atf.test.mk
  stable/10/share/mk/bsd.libnames.mk
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
  stable/10/usr.bin/atf/atf-sh/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/UPDATING
==============================================================================
--- stable/10/UPDATING	Sun Aug 31 21:58:07 2014	(r270904)
+++ stable/10/UPDATING	Sun Aug 31 23:09:23 2014	(r270905)
@@ -16,6 +16,22 @@ from older versions of FreeBSD, try WITH
 stable/10, and then rebuild without this option. The bootstrap process from
 older version of current is a bit fragile.
 
+20140831:
+	The libatf-c and libatf-c++ major versions were downgraded to 0 and
+	1 respectively to match the upstream numbers.  They were out of
+	sync because, when they were originally added to FreeBSD, the
+	upstream versions were not respected.  These libraries are private
+	and not yet built by default, so renumbering them should be a
+	non-issue.  However, unclean source trees will yield broken test
+	programs once the operator executes "make delete-old-libs" after a
+	"make installworld".
+
+	If you are using WITH_TESTS=yes (not the default), wipe the object
+	tree and rebuild from scratch to prevent spurious test failures.
+	This is only needed once: the old, misnumbered libraries have been
+	added to OptionalObsoleteFiles.inc so they will be removed during a
+	clean upgrade.
+
 20140814:
 	The ixgbe tunables now match their sysctl counterparts, for example:
 	hw.ixgbe.enable_aim => hw.ix.enable_aim

Modified: stable/10/contrib/atf/FREEBSD-Xlist
==============================================================================
--- stable/10/contrib/atf/FREEBSD-Xlist	Sun Aug 31 21:58:07 2014	(r270904)
+++ stable/10/contrib/atf/FREEBSD-Xlist	Sun Aug 31 23:09:23 2014	(r270905)
@@ -2,6 +2,8 @@
 */*/Makefile*
 */Atffile
 */Makefile*
+*/*.m4
+*/*.pc.in
 Atffile
 INSTALL
 Makefile*

Modified: stable/10/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/10/etc/mtree/BSD.tests.dist	Sun Aug 31 21:58:07 2014	(r270904)
+++ stable/10/etc/mtree/BSD.tests.dist	Sun Aug 31 23:09:23 2014	(r270905)
@@ -12,8 +12,6 @@
         ..
     ..
     share
-        aclocal
-        ..
         atf
         ..
         doc

Modified: stable/10/lib/atf/libatf-c++/Makefile
==============================================================================
--- stable/10/lib/atf/libatf-c++/Makefile	Sun Aug 31 21:58:07 2014	(r270904)
+++ stable/10/lib/atf/libatf-c++/Makefile	Sun Aug 31 23:09:23 2014	(r270905)
@@ -28,7 +28,8 @@
 .include <bsd.init.mk>
 
 LIB=		atf-c++
-SHLIB_MAJOR=	2
+PRIVATELIB=	true
+SHLIB_MAJOR=	1
 
 # libatf-c++ depends on the C version of the ATF library to build.
 DPADD=		${LIBATF_C}
@@ -72,20 +73,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: stable/10/lib/atf/libatf-c++/tests/Makefile
==============================================================================
--- stable/10/lib/atf/libatf-c++/tests/Makefile	Sun Aug 31 21:58:07 2014	(r270904)
+++ stable/10/lib/atf/libatf-c++/tests/Makefile	Sun Aug 31 23:09:23 2014	(r270905)
@@ -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: stable/10/lib/atf/libatf-c/Makefile
==============================================================================
--- stable/10/lib/atf/libatf-c/Makefile	Sun Aug 31 21:58:07 2014	(r270904)
+++ stable/10/lib/atf/libatf-c/Makefile	Sun Aug 31 23:09:23 2014	(r270905)
@@ -28,7 +28,8 @@
 .include <bsd.init.mk>
 
 LIB=		atf-c
-SHLIB_MAJOR=	1
+PRIVATELIB=	true
+SHLIB_MAJOR=	0
 
 ATF=		${.CURDIR:H:H:H}/contrib/atf
 .PATH:		${ATF}
@@ -74,22 +75,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: stable/10/lib/atf/libatf-c/tests/Makefile
==============================================================================
--- stable/10/lib/atf/libatf-c/tests/Makefile	Sun Aug 31 21:58:07 2014	(r270904)
+++ stable/10/lib/atf/libatf-c/tests/Makefile	Sun Aug 31 23:09:23 2014	(r270905)
@@ -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: stable/10/libexec/atf/atf-check/Makefile
==============================================================================
--- stable/10/libexec/atf/atf-check/Makefile	Sun Aug 31 21:58:07 2014	(r270904)
+++ stable/10/libexec/atf/atf-check/Makefile	Sun Aug 31 23:09:23 2014	(r270905)
@@ -37,11 +37,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: stable/10/share/mk/atf.test.mk
==============================================================================
--- stable/10/share/mk/atf.test.mk	Sun Aug 31 21:58:07 2014	(r270904)
+++ stable/10/share/mk/atf.test.mk	Sun Aug 31 23:09:23 2014	(r270905)
@@ -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: stable/10/share/mk/bsd.libnames.mk
==============================================================================
--- stable/10/share/mk/bsd.libnames.mk	Sun Aug 31 21:58:07 2014	(r270904)
+++ stable/10/share/mk/bsd.libnames.mk	Sun Aug 31 23:09:23 2014	(r270905)
@@ -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: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Sun Aug 31 21:58:07 2014	(r270904)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Sun Aug 31 23:09:23 2014	(r270905)
@@ -4070,7 +4070,38 @@ 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
+OLD_LIBS+=usr/lib/private/libatf-c.so.1
+OLD_LIBS+=usr/lib/private/libatf-c++.so.2
+.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
+OLD_LIBS+=usr/lib32/private/libatf-c.so.1
+OLD_LIBS+=usr/lib32/private/libatf-c++.so.2
+.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/bin/date/legacy_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/test_helpers_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/fork_test
@@ -4085,6 +4116,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
@@ -4092,6 +4124,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: stable/10/usr.bin/atf/atf-sh/Makefile
==============================================================================
--- stable/10/usr.bin/atf/atf-sh/Makefile	Sun Aug 31 21:58:07 2014	(r270904)
+++ stable/10/usr.bin/atf/atf-sh/Makefile	Sun Aug 31 23:09:23 2014	(r270905)
@@ -39,24 +39,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

More information about the svn-src-all mailing list