Re: Upgrading -RELEASE to -CURRENT

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

Thanks to jhb@ for suggesting MOVED_LIBS, which should handle this 'transition' smoothly.

-Dimitry