git: bbe50accc9ee - stable/13 - Belatedly track private lib renaming for OptionalObsoleteFiles.inc
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 09 Feb 2022 17:40:41 UTC
The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bbe50accc9ee80dd6b2636d8648c9748a3bfb30c commit bbe50accc9ee80dd6b2636d8648c9748a3bfb30c Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2021-10-09 00:15:43 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2022-02-09 17:39:51 +0000 Belatedly track private lib renaming for OptionalObsoleteFiles.inc Reviewed by: kevans Fixes: 5551c573554e ("Rework PRIVATELIB") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32384 (cherry picked from commit 032448cd2c52161aa03fd4ee5bf243d78d61b53e) --- tools/build/mk/OptionalObsoleteFiles.inc | 96 ++++++++++++++++---------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index ecf155adb396..bda8a435c5e1 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2907,14 +2907,14 @@ OLD_FILES+=usr/lib/pam_krb5.so OLD_LIBS+=usr/lib/pam_krb5.so.6 OLD_FILES+=usr/lib/pam_ksu.so OLD_LIBS+=usr/lib/pam_ksu.so.6 -OLD_FILES+=usr/lib/private/libheimipcc.a -OLD_FILES+=usr/lib/private/libheimipcc.so -OLD_LIBS+=usr/lib/private/libheimipcc.so.11 -OLD_FILES+=usr/lib/private/libheimipcc_p.a -OLD_FILES+=usr/lib/private/libheimipcs.a -OLD_FILES+=usr/lib/private/libheimipcs.so -OLD_LIBS+=usr/lib/private/libheimipcs.so.11 -OLD_FILES+=usr/lib/private/libheimipcs_p.a +OLD_FILES+=usr/lib/libprivateheimipcc.a +OLD_FILES+=usr/lib/libprivateheimipcc.so +OLD_LIBS+=usr/lib/libprivateheimipcc.so.11 +OLD_FILES+=usr/lib/libprivateheimipcc_p.a +OLD_FILES+=usr/lib/libprivateheimipcs.a +OLD_FILES+=usr/lib/libprivateheimipcs.so +OLD_LIBS+=usr/lib/libprivateheimipcs.so.11 +OLD_FILES+=usr/lib/libprivateheimipcs_p.a .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_FILES+=usr/lib32/libasn1.a OLD_FILES+=usr/lib32/libasn1.so @@ -2984,14 +2984,14 @@ OLD_FILES+=usr/lib32/pam_krb5.so OLD_LIBS+=usr/lib32/pam_krb5.so.6 OLD_FILES+=usr/lib32/pam_ksu.so OLD_LIBS+=usr/lib32/pam_ksu.so.6 -OLD_FILES+=usr/lib32/private/libheimipcc.a -OLD_FILES+=usr/lib32/private/libheimipcc.so -OLD_LIBS+=usr/lib32/private/libheimipcc.so.11 -OLD_FILES+=usr/lib32/private/libheimipcc_p.a -OLD_FILES+=usr/lib32/private/libheimipcs.a -OLD_FILES+=usr/lib32/private/libheimipcs.so -OLD_LIBS+=usr/lib32/private/libheimipcs.so.11 -OLD_FILES+=usr/lib32/private/libheimipcs_p.a +OLD_FILES+=usr/lib32/libprivateheimipcc.a +OLD_FILES+=usr/lib32/libprivateheimipcc.so +OLD_LIBS+=usr/lib32/libprivateheimipcc.so.11 +OLD_FILES+=usr/lib32/libprivateheimipcc_p.a +OLD_FILES+=usr/lib32/libprivateheimipcs.a +OLD_FILES+=usr/lib32/libprivateheimipcs.so +OLD_LIBS+=usr/lib32/libprivateheimipcs.so.11 +OLD_FILES+=usr/lib32/libprivateheimipcs_p.a .endif OLD_FILES+=usr/libexec/digest-service OLD_FILES+=usr/libexec/hprop @@ -3743,15 +3743,15 @@ OLD_FILES+=usr/share/man/man3/com_err.3.gz .endif .if ${MK_LDNS} == no -OLD_FILES+=usr/lib/private/libldns.a -OLD_FILES+=usr/lib/private/libldns.so -OLD_LIBS+=usr/lib/private/libldns.so.5 -OLD_FILES+=usr/lib/private/libldns_p.a +OLD_FILES+=usr/lib/libprivateldns.a +OLD_FILES+=usr/lib/libprivateldns.so +OLD_LIBS+=usr/lib/libprivateldns.so.5 +OLD_FILES+=usr/lib/libprivateldns_p.a .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" -OLD_FILES+=usr/lib32/private/libldns.a -OLD_FILES+=usr/lib32/private/libldns.so -OLD_LIBS+=usr/lib32/private/libldns.so.5 -OLD_FILES+=usr/lib32/private/libldns_p.a +OLD_FILES+=usr/lib32/libprivateldns.a +OLD_FILES+=usr/lib32/libprivateldns.so +OLD_LIBS+=usr/lib32/libprivateldns.so.5 +OLD_FILES+=usr/lib32/libprivateldns_p.a .endif .endif @@ -7199,17 +7199,17 @@ OLD_FILES+=usr/bin/ssh-keygen OLD_FILES+=usr/bin/ssh-keyscan OLD_FILES+=usr/lib/pam_ssh.so OLD_LIBS+=usr/lib/pam_ssh.so.6 -OLD_FILES+=usr/lib/private/libssh.a -OLD_FILES+=usr/lib/private/libssh.so -OLD_LIBS+=usr/lib/private/libssh.so.5 -OLD_FILES+=usr/lib/private/libssh_p.a +OLD_FILES+=usr/lib/libprivatessh.a +OLD_FILES+=usr/lib/libprivatessh.so +OLD_LIBS+=usr/lib/libprivatessh.so.5 +OLD_FILES+=usr/lib/libprivatessh_p.a .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_FILES+=usr/lib32/pam_ssh.so OLD_LIBS+=usr/lib32/pam_ssh.so.6 -OLD_FILES+=usr/lib32/private/libssh.a -OLD_FILES+=usr/lib32/private/libssh.so -OLD_LIBS+=usr/lib32/private/libssh.so.5 -OLD_FILES+=usr/lib32/private/libssh_p.a +OLD_FILES+=usr/lib32/libprivatessh.a +OLD_FILES+=usr/lib32/libprivatessh.so +OLD_LIBS+=usr/lib32/libprivatessh.so.5 +OLD_FILES+=usr/lib32/libprivatessh_p.a .endif OLD_FILES+=usr/libexec/sftp-server OLD_FILES+=usr/libexec/ssh-keysign @@ -7619,8 +7619,8 @@ OLD_FILES+=usr/lib/libypclnt_p.a OLD_FILES+=usr/lib/libz_p.a OLD_FILES+=usr/lib/libzfs_core_p.a OLD_FILES+=usr/lib/libzfs_p.a -OLD_FILES+=usr/lib/private/libldns_p.a -OLD_FILES+=usr/lib/private/libssh_p.a +OLD_FILES+=usr/lib/libprivateldns_p.a +OLD_FILES+=usr/lib/libprivatessh_p.a .endif .if ${MK_QUOTAS} == no @@ -8253,8 +8253,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.0 -OLD_LIBS+=usr/lib/private/libatf-c++.so.1 +OLD_LIBS+=usr/lib/libprivateatf-c.so.0 +OLD_LIBS+=usr/lib/libprivateatf-c++.so.1 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_LIBS+=usr/lib32/libatf-c++.a OLD_LIBS+=usr/lib32/libatf-c++.so @@ -8265,8 +8265,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.0 -OLD_LIBS+=usr/lib32/private/libatf-c++.so.1 +OLD_LIBS+=usr/lib32/libprivateatf-c.so.0 +OLD_LIBS+=usr/lib32/libprivateatf-c++.so.1 .endif OLD_FILES+=usr/libdata/pkgconfig/atf-c++.pc OLD_FILES+=usr/libdata/pkgconfig/atf-c.pc @@ -8795,8 +8795,8 @@ OLD_FILES+=usr/include/atf-c/tc.h OLD_FILES+=usr/include/atf-c/tp.h OLD_FILES+=usr/include/atf-c/utils.h OLD_FILES+=usr/lib/debug/usr/bin/kyua.debug -OLD_LIBS+=usr/lib/private/libatf-c++.so.2 -OLD_LIBS+=usr/lib/private/libatf-c.so.1 +OLD_LIBS+=usr/lib/libprivateatf-c++.so.2 +OLD_LIBS+=usr/lib/libprivateatf-c.so.1 OLD_FILES+=usr/share/examples/kyua/kyua.conf OLD_FILES+=usr/share/examples/kyua/Kyuafile.top OLD_FILES+=usr/share/kyua/misc/context.html @@ -9289,15 +9289,15 @@ OLD_DIRS+=usr/tests/usr.bin/yacc .if ${MK_UNBOUND} == no OLD_FILES+=etc/rc.d/local_unbound OLD_FILES+=etc/unbound -OLD_FILES+=usr/lib/private/libunbound.a -OLD_FILES+=usr/lib/private/libunbound.so -OLD_LIBS+=usr/lib/private/libunbound.so.5 -OLD_FILES+=usr/lib/private/libunbound_p.a +OLD_FILES+=usr/lib/libprivateunbound.a +OLD_FILES+=usr/lib/libprivateunbound.so +OLD_LIBS+=usr/lib/libprivateunbound.so.5 +OLD_FILES+=usr/lib/libprivateunbound_p.a .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" -OLD_FILES+=usr/lib32/private/libunbound.a -OLD_FILES+=usr/lib32/private/libunbound.so -OLD_LIBS+=usr/lib32/private/libunbound.so.5 -OLD_FILES+=usr/lib32/private/libunbound_p.a +OLD_FILES+=usr/lib32/libprivateunbound.a +OLD_FILES+=usr/lib32/libprivateunbound.so +OLD_LIBS+=usr/lib32/libprivateunbound.so.5 +OLD_FILES+=usr/lib32/libprivateunbound_p.a OLD_FILES+=usr/share/man/man5/local-unbound.conf.5.gz OLD_FILES+=usr/share/man/man8/local-unbound-anchor.8.gz OLD_FILES+=usr/share/man/man8/local-unbound-checkconf.8.gz