From nobody Fri Apr 29 20:55:01 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1829419941BA; Fri, 29 Apr 2022 20:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kql9d3LXgz3Dx3; Fri, 29 Apr 2022 20:55:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651265701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hH/H3+2pRQyNrH9WE1bPsQzXL9LIKVljjfd4us11ZQY=; b=vC0c6euU6/YvDvp7Bd0xWfGNK2D9YyxjdMch7h6Tr587/8VlYyOF4fqf2GVtz4st3lQh6U fubHDa8O+HcYiPIoBQn1j+MiPXkaxkOYcJ5q/X+vjkiGb7HXQQRDl2O/17tMLnCwcfNoXx XuKBZkPzVeZmeJSjayT+1Om97+CnW/g+s/3ULvBhqjE4FuPcnn2mUH6cXCPBDN9OQA8cX7 3QXm24BOxiTMFIXYRD/rHBo81tUj7j/41qTmJ3QzplMI9utFcg85curqrbCqtiMAk/lBMB 5Sxil4EpDyDxct2P5bJ/22PYm82pcrc9xJu8S5qfXjWVt0wj91OVJwq60o1NVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 376A414226; Fri, 29 Apr 2022 20:55:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23TKt1Hj055086; Fri, 29 Apr 2022 20:55:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23TKt1km055085; Fri, 29 Apr 2022 20:55:01 GMT (envelope-from git) Date: Fri, 29 Apr 2022 20:55:01 GMT Message-Id: <202204292055.23TKt1km055085@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 1367dcbfefec - stable/13 - Only use OLD_LIBS with shared libraries. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1367dcbfefecc6dc4970e24a9c435b24dbfade4d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651265701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hH/H3+2pRQyNrH9WE1bPsQzXL9LIKVljjfd4us11ZQY=; b=bNZJXCJrBvGV/zKtMK3tV2SLMJEkckzbBFFWKXd89DOYC4xlqqV79oVURznPl8Cp5Q428H h7TU5xJHb/xE+YsHr39eVmo4ExduBnu8631id5DMDmtlLSwrIWTmmP5yWx8RZt1PpAc7+/ BVPxAFPM1xNXLe4AqOV/KlqrjeiNghcImEVl19gRfgyetX+2poBgUBwucpcjjMB3tIq2Ty uf2aRkMDhZxJ+pXJQT2NsrsLehclaoeyH56dxwUjh/dzAWN/ny/t0DBkpU+naRzNVcQA9d xuMiXleW4yzvkgFnVXnmNWpvsxmX/dyqWHrx8eYKyqZnZujP4ms9741tvX7QJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651265701; a=rsa-sha256; cv=none; b=D8C6Zg+EUAoLwARcC8QZg79UPpJiXeQ/i1EbNOfk8d2IPCvXn7/aX3dBoxJ802BEv7UH+7 xup1S27cLg8Z5NrBozJzAQHC0Y+Ce4sHGDhBfpz2/KWrP0tRhx7k2BCkvda+VTIzS+7eRY NGXlO7p1grJ9yjUlRc1J/g6Lf7Py0yCFuyxJueN4LBKmFtdKjdbhsok3tZhoMdXFRLR1RI pEeUmFqjRTg1NRf7/fGwZovLjRrTHGBpxvXwNHZl7SMqYjLnIh4GnsxePjz2x28cpOYukI xRSpF0zvBDhS0Eg5o+e+VlUDIZ5PtxFfhIVKmvoOiQtaT06bgfs9dHV4JCl/zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1367dcbfefecc6dc4970e24a9c435b24dbfade4d commit 1367dcbfefecc6dc4970e24a9c435b24dbfade4d Author: John Baldwin AuthorDate: 2021-12-03 01:30:00 +0000 Commit: John Baldwin CommitDate: 2022-04-29 20:50:04 +0000 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. (cherry picked from commit 60a8277413eca3fa57f85caf331b080aee030fe5) --- ObsoleteFiles.inc | 34 ++++++++++++++++---------------- tools/build/mk/OptionalObsoleteFiles.inc | 34 ++++++++++++++++---------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 0fe277b1bc6b..0b70ebf521fb 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -6307,7 +6307,7 @@ OLD_FILES+=usr/tests/sys/geom/class/gate/conf.sh OLD_FILES+=usr/lib/libbsnmptools.a OLD_FILES+=usr/lib/libbsnmptools_p.a OLD_LIBS+=usr/lib/libbsnmptools.so.0 -OLD_LIBS+=usr/lib/libbsnmptools.so +OLD_FILES+=usr/lib/libbsnmptools.so # 20170102: sysdecode_getfsstat_flags() renamed to sysdecode_getfsstat_mode() OLD_FILES+=usr/share/man/man3/sysdecode_getfsstat_flags.3.gz # 20161230: libarchive ACL pax test renamed to test_acl_pax_posix1e.tar.uu @@ -10557,7 +10557,7 @@ OLD_FILES+=usr/share/examples/atm/fore-microcode.txt OLD_FILES+=usr/share/examples/atm/sscf-design.txt OLD_FILES+=usr/share/examples/atm/sscop-design.txt OLD_LIBS+=lib/libatm.so.5 -OLD_LIBS+=usr/lib/libatm.so +OLD_FILES+=usr/lib/libatm.so OLD_DIRS+=usr/include/netatm/sigpvc OLD_DIRS+=usr/include/netatm/spans OLD_DIRS+=usr/include/netatm/ipatm @@ -12786,16 +12786,16 @@ OLD_LIBS+=usr/lib/libobjc.so.2 OLD_LIBS+=usr/lib32/libgssapi.so.8 OLD_LIBS+=usr/lib32/libobjc.so.2 # 20070519: GCC 4.2 -OLD_LIBS+=usr/lib/libg2c.a -OLD_LIBS+=usr/lib/libg2c.so +OLD_FILES+=usr/lib/libg2c.a +OLD_FILES+=usr/lib/libg2c.so OLD_LIBS+=usr/lib/libg2c.so.2 -OLD_LIBS+=usr/lib/libg2c_p.a -OLD_LIBS+=usr/lib/libgcc_pic.a -OLD_LIBS+=usr/lib32/libg2c.a -OLD_LIBS+=usr/lib32/libg2c.so +OLD_FILES+=usr/lib/libg2c_p.a +OLD_FILES+=usr/lib/libgcc_pic.a +OLD_FILES+=usr/lib32/libg2c.a +OLD_FILES+=usr/lib32/libg2c.so OLD_LIBS+=usr/lib32/libg2c.so.2 -OLD_LIBS+=usr/lib32/libg2c_p.a -OLD_LIBS+=usr/lib32/libgcc_pic.a +OLD_FILES+=usr/lib32/libg2c_p.a +OLD_FILES+=usr/lib32/libgcc_pic.a # 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade OLD_LIBS+=lib/libcrypto.so.4 OLD_LIBS+=usr/lib/libssl.so.4 @@ -12818,14 +12818,14 @@ OLD_LIBS+=usr/lib/libpthread.so.2 # 20060127: revert libdisk to static-only OLD_LIBS+=usr/lib/libdisk.so.3 # 20051027: libc_r discontinued (removed 20101113) -OLD_LIBS+=usr/lib/libc_r.a -OLD_LIBS+=usr/lib/libc_r.so +OLD_FILES+=usr/lib/libc_r.a +OLD_FILES+=usr/lib/libc_r.so OLD_LIBS+=usr/lib/libc_r.so.7 -OLD_LIBS+=usr/lib/libc_r_p.a -OLD_LIBS+=usr/lib32/libc_r.a -OLD_LIBS+=usr/lib32/libc_r.so +OLD_FILES+=usr/lib/libc_r_p.a +OLD_FILES+=usr/lib32/libc_r.a +OLD_FILES+=usr/lib32/libc_r.so OLD_LIBS+=usr/lib32/libc_r.so.7 -OLD_LIBS+=usr/lib32/libc_r_p.a +OLD_FILES+=usr/lib32/libc_r_p.a # 20050722: bump for 6.0-RELEASE OLD_LIBS+=lib/libalias.so.4 OLD_LIBS+=lib/libatm.so.2 @@ -12992,7 +12992,7 @@ OLD_LIBS+=usr/lib/libkafs.so.3 OLD_LIBS+=usr/lib/libkafs5.so.5 OLD_LIBS+=usr/lib/libkdb.so.3 OLD_LIBS+=usr/lib/libkrb.so.3 -OLD_LIBS+=usr/lib/libroken.so. +OLD_LIBS+=usr/lib/libroken.so.5 OLD_LIBS+=usr/lib/libssl.so.2 OLD_LIBS+=usr/lib/pam_kerberosIV.so # 200208XX diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 4ca7c32ebd73..d17eeb697fa1 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1148,10 +1148,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 @@ -7173,8 +7173,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 @@ -8443,27 +8443,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