Page MenuHomeFreeBSD

D174.diff
No OneTemporary

D174.diff

Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -31,6 +31,19 @@
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20140605:
+ The libatf-c and libatf-c++ major versions were downgraded to 0 to
+ match the upstream numbers. These libraries are now private so this
+ should be a non-issue. However, unclean source trees will yield
+ broken test programs once the operator issues "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.
Index: lib/atf/libatf-c++/Makefile
===================================================================
--- lib/atf/libatf-c++/Makefile
+++ lib/atf/libatf-c++/Makefile
@@ -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}
Index: lib/atf/libatf-c/Makefile
===================================================================
--- lib/atf/libatf-c/Makefile
+++ lib/atf/libatf-c/Makefile
@@ -30,7 +30,7 @@
LIB= atf-c
PRIVATELIB= true
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 0
ATF= ${.CURDIR:H:H:H}/contrib/atf
.PATH: ${ATF}
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -4112,6 +4112,8 @@
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.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

File Metadata

Mime Type
text/plain
Expires
Wed, Aug 5, 7:52 AM (9 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36016406
Default Alt Text
D174.diff (2 KB)

Event Timeline