From nobody Tue Apr 23 00:22:28 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 4VNjVv4l06z5J1BV for ; Tue, 23 Apr 2024 00:22:31 +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 4VNjVt6NnNz48vK; Tue, 23 Apr 2024 00:22:30 +0000 (UTC) (envelope-from jeffpc@josefsipek.net) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of jeffpc@josefsipek.net designates 71.174.62.3 as permitted sender) smtp.mailfrom=jeffpc@josefsipek.net Received: from satis (satis [172.27.0.85]) by smtp.jeffnet.31bits.net (Postfix) with ESMTPSA id 7D9332C489; Tue, 23 Apr 2024 00:22:29 +0000 (UTC) Date: Mon, 22 Apr 2024 20:22:28 -0400 From: Josef 'Jeff' Sipek To: Dimitry Andric Cc: Warner Losh , FreeBSD Hackers Subject: Re: Upgrading -RELEASE to -CURRENT Message-ID: References: <9C0C7B9F-9780-4B7D-9B46-CD83B516BD2A@FreeBSD.org> <849819B4-9EE6-4776-8079-B0E12ED457D0@FreeBSD.org> List-Id: Technical discussions relating to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-hackers List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-hackers@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.57 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.997]; NEURAL_HAM_MEDIUM(-0.98)[-0.977]; MID_RHS_NOT_FQDN(0.50)[]; R_SPF_ALLOW(-0.20)[+mx]; ONCE_RECEIVED(0.10)[]; RCVD_NO_TLS_LAST(0.10)[]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; ASN(0.00)[asn:701, ipnet:71.174.0.0/16, country:US]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[freebsd-hackers@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; MISSING_XM_UA(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DMARC_NA(0.00)[josefsipek.net]; TO_DN_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[3] X-Rspamd-Queue-Id: 4VNjVt6NnNz48vK 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 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 ... >>> Old libraries removed before installworld: root@odin# find / -name 'libcxxrt.*' -xdev -ls 35733 113 -r--r--r-- 1 root wheel 106712 Apr 18 20:31 /usr/lib/libcxxrt.so.1 35633 377 -r--r--r-- 1 root wheel 358086 Apr 18 20:31 /usr/lib/libcxxrt.a 103067 225 -r--r--r-- 1 root wheel 205880 Mar 23 08:48 /usr/lib/debug/lib/libcxxrt.so.1.debug 50292 217 -r--r--r-- 1 root wheel 157116 Apr 18 20:37 /usr/lib/debug/usr/lib32/libcxxrt.so.1.debug 35002 241 -r--r--r-- 1 root wheel 208792 Apr 18 20:31 /usr/lib/debug/usr/lib/libcxxrt.so.1.debug 35735 1 lrwxr-xr-x 1 root wheel 13 Apr 18 20:31 /usr/lib/libcxxrt.so -> libcxxrt.so.1 50386 105 -r--r--r-- 1 root wheel 88116 Apr 18 20:37 /usr/lib32/libcxxrt.so.1 50291 321 -r--r--r-- 1 root wheel 220338 Apr 18 20:37 /usr/lib32/libcxxrt.a 50951 1 lrwxr-xr-x 1 root wheel 13 Apr 18 20:37 /usr/lib32/libcxxrt.so -> libcxxrt.so.1 102692 113 -r--r--r-- 1 root wheel 107512 Mar 23 08:48 /lib/libcxxrt.so.1 after installworld: root@odin# find / -name 'libcxxrt.*' -xdev -ls 35633 377 -r--r--r-- 1 root wheel 358086 Apr 18 20:31 /usr/lib/libcxxrt.a 101307 241 -r--r--r-- 1 root wheel 208792 Apr 22 19:59 /usr/lib/debug/lib/libcxxrt.so.1.debug 50292 217 -r--r--r-- 1 root wheel 157116 Apr 18 20:37 /usr/lib/debug/usr/lib32/libcxxrt.so.1.debug 35002 241 -r--r--r-- 1 root wheel 208792 Apr 18 20:31 /usr/lib/debug/usr/lib/libcxxrt.so.1.debug 101309 1 lrwxr-xr-x 1 root wheel 23 Apr 22 19:59 /usr/lib/libcxxrt.so -> ../../lib/libcxxrt.so.1 50386 105 -r--r--r-- 1 root wheel 88116 Apr 18 20:37 /usr/lib32/libcxxrt.so.1 50291 321 -r--r--r-- 1 root wheel 220338 Apr 18 20:37 /usr/lib32/libcxxrt.a 117893 1 lrwxr-xr-x 1 root wheel 13 Apr 22 20:00 /usr/lib32/libcxxrt.so -> libcxxrt.so.1 101970 113 -r--r--r-- 1 root wheel 106712 Apr 22 19:59 /lib/libcxxrt.so.1 after delete-old-libs: root@odin# find / -name 'libcxxrt.*' -xdev -ls 35633 377 -r--r--r-- 1 root wheel 358086 Apr 18 20:31 /usr/lib/libcxxrt.a 101307 241 -r--r--r-- 1 root wheel 208792 Apr 22 19:59 /usr/lib/debug/lib/libcxxrt.so.1.debug 101309 1 lrwxr-xr-x 1 root wheel 23 Apr 22 19:59 /usr/lib/libcxxrt.so -> ../../lib/libcxxrt.so.1 50291 321 -r--r--r-- 1 root wheel 220338 Apr 18 20:37 /usr/lib32/libcxxrt.a 117893 1 lrwxr-xr-x 1 root wheel 13 Apr 22 20:00 /usr/lib32/libcxxrt.so -> libcxxrt.so.1 101970 113 -r--r--r-- 1 root wheel 106712 Apr 22 19:59 /lib/libcxxrt.so.1 Compared to what I see on 14.0-RELEASE, note that: 1. /usr/lib/debug/usr/lib32/libcxxrt.so.1.debug is missing 2. /usr/lib32/libcxxrt.so.1 is missing 3. /usr/lib32/libcxxrt.so is a broken symlink (because of #2) At least I'm assuming that lib32 is still supposed to exist. (A repeated 'make installworld' recreates the missing files.) Jeff.