Date: Wed, 24 Apr 2024 09:57:33 -0400 From: Josef 'Jeff' Sipek <jeffpc@josefsipek.net> To: Dimitry Andric <dim@freebsd.org> Cc: Warner Losh <imp@bsdimp.com>, FreeBSD Hackers <freebsd-hackers@freebsd.org> Subject: Re: Upgrading -RELEASE to -CURRENT Message-ID: <ZikPzVvPP_Rz3Oml@satis> In-Reply-To: <F38A9E56-4ED2-4807-B9CF-6D4DF1F29290@FreeBSD.org> References: <ZiMi3Zb1jVrPSOQL@satis> <ZiaQKHw57SDqVxqo@satis> <A20B9013-EB8E-4044-A033-CA74E225124C@FreeBSD.org> <Ziabvutgf8bCr4WS@satis> <9C0C7B9F-9780-4B7D-9B46-CD83B516BD2A@FreeBSD.org> <ZiackHc7wYgHF0xM@satis> <849819B4-9EE6-4776-8079-B0E12ED457D0@FreeBSD.org> <Zia6apqT12g257c3@satis> <Zib_ROT79UHPfEZU@satis> <F38A9E56-4ED2-4807-B9CF-6D4DF1F29290@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Apr 23, 2024 at 19:45:21 +0200, Dimitry Andric wrote: > On 23 Apr 2024, at 02:22, Josef 'Jeff' Sipek <jeffpc@josefsipek.net> wrote: > > > > On Mon, Apr 22, 2024 at 15:28:42 -0400, Josef 'Jeff' Sipek wrote: > >> On Mon, Apr 22, 2024 at 20:58:34 +0200, Dimitry Andric wrote: > >>> To properly finish up this thread, Jeff was right, and > >>> https://cgit.freebsd.org/src/commit/?id=da77a1b4f0dff was the cause. > >>> That commit added a .include <bsd.own.mk> at the top of libcxxrt's > >>> Makefile, which is normally fine, but not if you use SHLIBDIR?=/lib. > >>> That sort of assignment should always be done before including any of > >>> the bsd.*.mk files. > >>> > >>> I have committed https://cgit.freebsd.org/src/commit/?id=911a6479e18bc > >>> for now, which should fix the problem. It also adds an ObsoleteFiles.inc > >>> entry for /usr/lib/libcxxrt.so.1, so the file should be removed when you > >>> run "make delete-old-libs". > >> > >> FWIW, with this change, I just did a successful upgrade of a 14.0-RELEASE > >> directly to -CURRENT. > > > > I think a little bit more is needed to completely fix the issue. It looks > > like delete-old-libs gets rid of /usr/lib32/libcxxrt.so.1: > > > > root@odin# make delete-old-libs > > .. > > remove /usr/lib/debug/usr/lib/libcxxrt.so.1.debug? y > > remove /usr/lib32/libcxxrt.so.1? y > > remove /usr/lib/debug/usr/lib32/libcxxrt.so.1.debug? y > > Ok, that should hopefully be fixed by: > https://cgit.freebsd.org/src/commit/?id=f48643d376a4 Yep, that fixes it. Thanks! Jeff.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ZikPzVvPP_Rz3Oml>