d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Homogenize libatf-* version numbers with upstream.

Browse Source 
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.
This commit is contained in:
jmmv 2014-06-06 17:05:43 +00:00
parent 701aae6977
commit 8ff330c3f4
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
UPDATING
View File

@ -31,6 +31,22 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
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.

2
lib/atf/libatf-c++/Makefile
View File

@ -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}

2
lib/atf/libatf-c/Makefile
View File

@ -30,7 +30,7 @@
LIB= atf-c
PRIVATELIB= true
SHLIB_MAJOR= 1
SHLIB_MAJOR= 0
ATF= ${.CURDIR:H:H:H}/contrib/atf
.PATH: ${ATF}

4
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -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