Date: Fri, 6 Jun 2014 17:05:43 +0000 (UTC) From: Julio Merino <jmmv@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r267172 - in head: . lib/atf/libatf-c lib/atf/libatf-c++ tools/build/mk Message-ID: <201406061705.s56H5hmE038968@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmmv Date: Fri Jun 6 17:05:43 2014 New Revision: 267172 URL: http://svnweb.freebsd.org/changeset/base/267172 Log: 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. Modified: head/UPDATING head/lib/atf/libatf-c++/Makefile head/lib/atf/libatf-c/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/UPDATING ============================================================================== --- head/UPDATING Fri Jun 6 16:37:42 2014 (r267171) +++ head/UPDATING Fri Jun 6 17:05:43 2014 (r267172) @@ -31,6 +31,22 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20140606: + 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. + 20140512: Clang and llvm have been upgraded to 3.4.1 release. Modified: head/lib/atf/libatf-c++/Makefile ============================================================================== --- head/lib/atf/libatf-c++/Makefile Fri Jun 6 16:37:42 2014 (r267171) +++ head/lib/atf/libatf-c++/Makefile Fri Jun 6 17:05:43 2014 (r267172) @@ -30,7 +30,7 @@ LIB= atf-c++ PRIVATELIB= true -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 # libatf-c++ depends on the C version of the ATF library to build. DPADD= ${LIBATFC} Modified: head/lib/atf/libatf-c/Makefile ============================================================================== --- head/lib/atf/libatf-c/Makefile Fri Jun 6 16:37:42 2014 (r267171) +++ head/lib/atf/libatf-c/Makefile Fri Jun 6 17:05:43 2014 (r267172) @@ -30,7 +30,7 @@ LIB= atf-c PRIVATELIB= true -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 0 ATF= ${.CURDIR:H:H:H}/contrib/atf .PATH: ${ATF} Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Jun 6 16:37:42 2014 (r267171) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Jun 6 17:05:43 2014 (r267172) @@ -4112,6 +4112,8 @@ 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 @@ -4122,6 +4124,8 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406061705.s56H5hmE038968>