From nobody Thu Dec 30 16:10:12 2021 X-Original-To: dev-commits-src-main@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 1DA1A1925255; Thu, 30 Dec 2021 16:10:13 +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 4JPtXN65tcz4Sq6; Thu, 30 Dec 2021 16:10:12 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 AD5B51B4C7; Thu, 30 Dec 2021 16:10:12 +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 1BUGACLV054966; Thu, 30 Dec 2021 16:10:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BUGAC8t054952; Thu, 30 Dec 2021 16:10:12 GMT (envelope-from git) Date: Thu, 30 Dec 2021 16:10:12 GMT Message-Id: <202112301610.1BUGAC8t054952@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 5e6a2d6eb220 - main - Reapply: move libc++ from /usr/lib to /lib List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e6a2d6eb220d780c9128c81b58f133114061415 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640880612; 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=/xlEKFP2kX3tU6NJfugqW8uRcf6BFSmZlmd6Mts0lO0=; b=t0KOMblqdAW9onDuzSxZ2LjjsGDWa5Tp8QO8NzlUKAzePK5f9nk7zGBIYET3tB46UNFag2 PvvtlpnqOudOAu8PiqHQxMau7GJQ1JHEejdkXK111d1bjRgN54Gfiz4hDeMyvbmKNwvsFv QiU5e9gSXrLaoHFo2KUYod0QhtHjNKtttETLhZpmzDOPm0lYmxRB7J0cId+EIuybUzLM94 htEES3udi+L6589YMH6AXFNetPVivU8zMF+FhgkxjpTC++I4fRK+u6ZUJl4SCqJZTvraDk ACJv1NmugqNzcaA6+9a1Ax3JrwOaSZ3su5goOsYWzIi1GmqWf6/yVRTqv+stIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640880612; a=rsa-sha256; cv=none; b=pP1jf1DKZMxp9fmbyE1KTsLC5jn/hoPwFNBjdCeHoUNWqAAvM1IDFAu7jXofsMzc9tWGnv VsZGeEXDHdn5P3tcRSJ4T19GioBevdC+WSMvNKe0SFWzs57trmMlPROcdWQYwopNFnZvLG jF2UaLslVIB6UuGeyWMRelTlGdELqSTmeKOUDgba/m8hfqI5IRpwPaG8pLOl1kVlgIWRKJ rgVoGzqlTDLnSTZot7xb+LBGIQgoS1wRf7pEWtgvwyY9zr3xtEXBlFR7s/H68qce4cvPe0 FZffIysMuMffYvVhyBCylcw74tp+/z4b25BZ4NtDsY+sre+5DksFblWl59Ns7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5e6a2d6eb220d780c9128c81b58f133114061415 commit 5e6a2d6eb220d780c9128c81b58f133114061415 Author: Dimitry Andric AuthorDate: 2021-12-30 16:03:10 +0000 Commit: Dimitry Andric CommitDate: 2021-12-30 16:08:54 +0000 Reapply: move libc++ from /usr/lib to /lib As with other runtime components like libc or libcxxrt. If desired we can stop linking devd statically after this change (to achive approximately no net change in required root filesystem size). We must set SHLIBDIR with ?= before including , otherwise that will have set SHBLIDIR to its default value of /usr/lib. Otherwise, "make delete-old-libs" would suggest to delete libc++.so.1 from /usr/lib, while there was not yet a copy in /lib. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33123 --- ObsoleteFiles.inc | 3 +++ lib/libc++/Makefile | 2 ++ 2 files changed, 5 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 4e99c917e89a..6207ad302bba 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -40,6 +40,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20211229 libc++ moved to /lib +OLD_LIBS+=usr/lib/libc++.so.1 + # 20211221 efi_set_variables_supported.3 should be efi_variables_supported.3 OLD_FILES+=usr/share/man/man3/efi_set_variables_supported.3.gz diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile index 2bc1bf40eccd..dda8bc1772c9 100644 --- a/lib/libc++/Makefile +++ b/lib/libc++/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +SHLIBDIR?= /lib + .include PACKAGE= clibs