diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2021-12-03 01:30:00 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2021-12-03 01:30:00 +0000 |
| commit | 60a8277413eca3fa57f85caf331b080aee030fe5 (patch) | |
| tree | 9cae04ec13d9730f48b9cadd2da2327a5e09bf34 /tools/build/mk/OptionalObsoleteFiles.inc | |
| parent | 5e077e08ef87126765b5a818def6cb99314ab192 (diff) | |
| download | src-60a8277413eca3fa57f85caf331b080aee030fe5.tar.gz src-60a8277413eca3fa57f85caf331b080aee030fe5.zip | |
Only use OLD_LIBS with shared libraries.
Use OLD_FILES for a few symbolic links and static libraries previously
included in OLD_LIBS.
Add a missing shared library major number to an old libroken entry.
Diffstat (limited to 'tools/build/mk/OptionalObsoleteFiles.inc')
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 02406a3c43e2..fea0af9edca0 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1146,10 +1146,10 @@ OLD_FILES+=usr/lib/libbe_p.a OLD_FILES+=usr/lib/libbe.so OLD_LIBS+=lib/libbe.so.1 OLD_FILES+=usr/lib/libzfs.a -OLD_LIBS+=usr/lib/libzfs.so +OLD_FILES+=usr/lib/libzfs.so OLD_FILES+=usr/lib/libzfs_core.a -OLD_LIBS+=usr/lib/libzfs_core.so -OLD_LIBS+=usr/lib/libzfs_core_p.a +OLD_FILES+=usr/lib/libzfs_core.so +OLD_FILES+=usr/lib/libzfs_core_p.a OLD_FILES+=usr/lib/libzfs_p.a OLD_FILES+=usr/lib/libzpool.a OLD_FILES+=usr/lib/libzpool.so @@ -7168,8 +7168,8 @@ OLD_FILES+=usr/share/man/man8/vendstat.8.gz .if ${MK_OPENMP} == no OLD_FILES+=usr/include/omp.h -OLD_LIBS+=usr/lib/libgomp.so -OLD_LIBS+=usr/lib32/libgomp.so +OLD_FILES+=usr/lib/libgomp.so +OLD_FILES+=usr/lib32/libgomp.so OLD_LIBS+=usr/lib/libomp.so OLD_LIBS+=usr/lib32/libomp.so .endif @@ -8438,27 +8438,27 @@ OLD_FILES+=usr/share/man/man8/telnetd.8.gz OLD_FILES+=usr/bin/atf-sh OLD_FILES+=usr/include/atf-c++/config.hpp OLD_FILES+=usr/include/atf-c/config.h -OLD_LIBS+=usr/lib/libatf-c++.a -OLD_LIBS+=usr/lib/libatf-c++.so +OLD_FILES+=usr/lib/libatf-c++.a +OLD_FILES+=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_FILES+=usr/lib/libatf-c++_p.a +OLD_FILES+=usr/lib/libatf-c.a +OLD_FILES+=usr/lib/libatf-c.so OLD_LIBS+=usr/lib/libatf-c.so.1 -OLD_LIBS+=usr/lib/libatf-c_p.a +OLD_FILES+=usr/lib/libatf-c_p.a 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 +OLD_FILES+=usr/lib32/libatf-c++.a +OLD_FILES+=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_FILES+=usr/lib32/libatf-c++_p.a +OLD_FILES+=usr/lib32/libatf-c.a +OLD_FILES+=usr/lib32/libatf-c.so OLD_LIBS+=usr/lib32/libatf-c.so.1 -OLD_LIBS+=usr/lib32/libatf-c_p.a +OLD_FILES+=usr/lib32/libatf-c_p.a OLD_LIBS+=usr/lib32/libprivateatf-c.so.0 OLD_LIBS+=usr/lib32/libprivateatf-c++.so.1 .endif |