From nobody Wed Apr 24 13:57:33 2024
X-Original-To: freebsd-hackers@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 4VPgXv2tgkz5HPvc
	for <freebsd-hackers@mlmmj.nyi.freebsd.org>; Wed, 24 Apr 2024 13:57:35 +0000 (UTC)
	(envelope-from jeffpc@josefsipek.net)
Received: from smtp.jeffnet.31bits.net (josefsipek.net [71.174.62.3])
	by mx1.freebsd.org (Postfix) with ESMTP id 4VPgXv2PN1z4Tn9;
	Wed, 24 Apr 2024 13:57:35 +0000 (UTC)
	(envelope-from jeffpc@josefsipek.net)
Authentication-Results: mx1.freebsd.org;
	none
Received: from satis (satis [172.27.0.85])
	by smtp.jeffnet.31bits.net (Postfix) with ESMTPSA id 1D3372C761;
	Wed, 24 Apr 2024 13:57:35 +0000 (UTC)
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>
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>
List-Id: Technical discussions relating to FreeBSD <freebsd-hackers.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/freebsd-hackers
List-Help: <mailto:freebsd-hackers+help@freebsd.org>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Subscribe: <mailto:freebsd-hackers+subscribe@freebsd.org>
List-Unsubscribe: <mailto:freebsd-hackers+unsubscribe@freebsd.org>
Sender: owner-freebsd-hackers@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <F38A9E56-4ED2-4807-B9CF-6D4DF1F29290@FreeBSD.org>
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
	module=replies;
	Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
	REPLY(-4.00)[];
	ASN(0.00)[asn:701, ipnet:71.174.0.0/16, country:US]
X-Rspamd-Queue-Id: 4VPgXv2PN1z4Tn9

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.