From nobody Thu Dec 30 16:58:22 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 50FBC192D811; Thu, 30 Dec 2021 16:58:25 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JPvc10fpPz4b3G; Thu, 30 Dec 2021 16:58:25 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183]) by cmsmtp with ESMTP id 2vNQnxWAIztEj2ykzn2FDs; Thu, 30 Dec 2021 16:58:25 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id 2ykxnCICvmX1k2ykynTUzn; Thu, 30 Dec 2021 16:58:25 +0000 X-Authority-Analysis: v=2.4 cv=Fe4keby6 c=1 sm=1 tr=0 ts=61cde531 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=IOMw9HtfNCkA:10 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=sd7n28qv-UnmQHX22mkA:9 a=CjuIK1q_8ugA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 10A1772A; Thu, 30 Dec 2021 08:58:23 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 1BUGwMkC009096; Thu, 30 Dec 2021 08:58:22 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202112301658.1BUGwMkC009096@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Dimitry Andric cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 5e6a2d6eb220 - main - Reapply: move libc++ from /usr/lib to /lib In-reply-to: <202112301610.1BUGAC8t054952@gitrepo.freebsd.org> References: <202112301610.1BUGAC8t054952@gitrepo.freebsd.org> Comments: In-reply-to Dimitry Andric message dated "Thu, 30 Dec 2021 16:10:12 +0000." 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=us-ascii Date: Thu, 30 Dec 2021 08:58:22 -0800 X-CMAE-Envelope: MS4xfLehC38CofRn21fH4FD1POvWwrrfSa4Qt6gJbhAT2z7nZm6tHMPBEvhge4a0nsAC6dtvYN2iULZfXdan5LgMdPgnXamRE33t0EhUNU8kVfdGldgDu/IW Kc744khpzObvIKX7ga9HcnymTO7/O1sCehmt17LQipuPLNHKUdevWciARtJtwgmuhdfotV9QyU8Z2qXscIXx3mavzn8nIGXQn0uCcf/xchpHjjuyslCPVObZ I3ToMAwsubufYCAgERRmeymtXDD+64B2DFHJ5bt+IS2AuMELg0htVr37pqM4aKzwe4Rti6sYXJn17oQ9J3eHvhBE7ztteG5Nd1d9FX94hNA= X-Rspamd-Queue-Id: 4JPvc10fpPz4b3G X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N This commit results in a different error. ld: error: /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/lib/libc++.so:2: cannot find /usr/lib/libc++.so.1 inside /export/obj/opt/src/git-src/amd64.am d64/tmp >>> GROUP ( /usr/lib/libc++.so.1 /usr/lib/libcxxrt.so ) >>> ^ c++: error: linker command failed with exit code 1 (use -v to see invocation) *** [libclang_rt.asan-x86_64.so.full] Error code 1 make[6]: stopped in /opt/src/git-src/lib/libclang_rt/asan_dynamic -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. In message <202112301610.1BUGAC8t054952@gitrepo.freebsd.org>, Dimitry Andric wr ites: > The branch main has been updated by dim: > > URL: https://cgit.FreeBSD.org/src/commit/?id=5e6a2d6eb220d780c9128c81b58f1331 > 14061415 > > 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 >