From nobody Tue Apr 23 17:45:21 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 4VP8fB2wsRz5HjRC for ; Tue, 23 Apr 2024 17:45:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VP8fB2NMWz4LjQ; Tue, 23 Apr 2024 17:45:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713894322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b5AvOpcl/gYFEer0My6H8zJRqq9amILO21zhu2q/VQ4=; b=FQkomWQzRiDrkk6vEAO/RGBVnnzSCw05S+eiDZECtwDE7pDoROTIb1Arh0biEPcEGkfe1L JlPrO+mDnWqsk3QpJakw/1OBC+uN6yTDgiN1BBemxBdUJyAGyLMEy68IcrKRcbov9q3hFq 7ZZV1Db6HQGRJ53hc6aIEhke9QQ2gHKrvuIY6zp29C1KjxYnef2o9jF0tTwckMqgLRTUUM f7ENOsj+auqal4RS2QNMYKdhXCwwRYZTVudzMKo8IRaGH3ynEOzaDGr1Plh6W2XcbKiExA qtcCPf1SsTceW7ok+yMqbypjM8l+oX7ZXfkHO1muGoEvxmt7ZmJ7wuQBj3jI5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713894322; a=rsa-sha256; cv=none; b=JuAWIpsIUeuYlA24ZYIYTlZeZF0yzpejYfurmsX9iNY8skAdD4vagXVRnPFng+zPvMm0Hg UetTgu7ACJuTr8hbBQPTKgLdGIi+HTpOivowePEFFlt6Z/71AW7kLmg6deiBSreCXu2RbP iON0tPgu32KmJARzP+JLDLwFK+uxdwUH+TouGMHHSZC2HD9qyvVT295mKRAVi2iu9Oo6Ci MT2q1lHRjVwOYPwdsJxRdE4CzIZ6hoGqy9Gw2eOBLTyMgU9idVw85AgVMcaLOZcOpfh/N2 pJfNMRcRSHuNNSuwPt8Ba9bK/0shtL7Zu6yaBANzQxJoeGXjpkknnmfemvis4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713894322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b5AvOpcl/gYFEer0My6H8zJRqq9amILO21zhu2q/VQ4=; b=dh7THwn/CjwltE580WQUYcZWCI6iUZ1rBennVRYRS6mmEm/x8glRKu933qhBmd3nQjRl7k PuTGKky63TAKMID/TZlNYN3JnGe5OxdhhMmvcGM8+TtZT9r2mNXRFqa+vxZ8rqvmCi2q/+ 6dXWN5nPR4UZgWQ4IOK0U/Cr8Y2A2yrdy2ZzurCpOd+VJupnYOIJkixu2zxzo8g9FhVWZ7 UBWtZOlHZOy9tpSrgIP0E8dqbSzJgfae5/pxl1T6JfCgSjHYAXLP99EG2o/M6KymOs/amo ZaoeAOtWnR+VMMfTolhLauNfEQt6YdmjxIHpU1LFGBScLu+wxAmJtqhs/htRHQ== Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "R3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VP8fB0znbzh0Y; Tue, 23 Apr 2024 17:45:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (longrow.home.andric.com [192.168.0.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 37D421F37B; Tue, 23 Apr 2024 19:45:21 +0200 (CEST) Content-Type: text/plain; charset=us-ascii 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 (Mac OS X Mail 16.0 \(3731.700.6.1.1\)) Subject: Re: Upgrading -RELEASE to -CURRENT From: Dimitry Andric In-Reply-To: Date: Tue, 23 Apr 2024 19:45:21 +0200 Cc: Warner Losh , FreeBSD Hackers Content-Transfer-Encoding: quoted-printable Message-Id: References: <9C0C7B9F-9780-4B7D-9B46-CD83B516BD2A@FreeBSD.org> <849819B4-9EE6-4776-8079-B0E12ED457D0@FreeBSD.org> To: Josef 'Jeff' Sipek X-Mailer: Apple Mail (2.3731.700.6.1.1) On 23 Apr 2024, at 02:22, Josef 'Jeff' Sipek = wrote: >=20 > 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=3Dda77a1b4f0dff 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?=3D/lib.= >>> That sort of assignment should always be done before including any = of >>> the bsd.*.mk files. >>>=20 >>> I have committed = https://cgit.freebsd.org/src/commit/?id=3D911a6479e18bc >>> 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". >>=20 >> FWIW, with this change, I just did a successful upgrade of a = 14.0-RELEASE >> directly to -CURRENT. >=20 > 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: >=20 > 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=3Df48643d376a4 Thanks to jhb@ for suggesting MOVED_LIBS, which should handle this = 'transition' smoothly. -Dimitry =20=