From nobody Thu Dec 30 10:16:48 2021 X-Original-To: dev-commits-src-all@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 003CF1931E53; Thu, 30 Dec 2021 10:16:51 +0000 (UTC) (envelope-from gljennjohn@gmail.com) Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JPkhf687Tz4nTW; Thu, 30 Dec 2021 10:16:50 +0000 (UTC) (envelope-from gljennjohn@gmail.com) Received: by mail-ed1-x535.google.com with SMTP id w16so96294995edc.11; Thu, 30 Dec 2021 02:16:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=9NMmkTAqAyPgc2Wl7kP8z9M9+xAWVBgkM1laU3oAphM=; b=a2jCqaDBe671k1RCUHnsbqLNm8tcoms9lCu/wSBGvaIdJI5JXQHcMCjAEUpjaQxprR Aje6aXp7blipuQBxiUEs9d43kvKIVR3SAhv0MRvy3YuTPeQm0tla9Ra7W9z+twt5OfKS pFCdIjq5Ex7xPQhvFCGEabzyXe5lyOpDIvy3jmrkuXYeCVllQqUFEpBCxtBBRF8Ukie6 kebpM8EmLR+nomFCy+A/iHvjF7VCVmvcYWpfFaLiUFhslvEFQlxdVMnbkJFJE/15NM31 BlrxjpvsSMKhOl0Eui0Sw6SLYwNSeJsuUw9Bq8t5zK20MX7faT6vHS4ludX3+ABbSraX C+JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=9NMmkTAqAyPgc2Wl7kP8z9M9+xAWVBgkM1laU3oAphM=; b=sRpt6/7t9mvO43Gkgnw3xm158KM8Nj/MQsSmJIvVYinpsTePbztx1wpww1gOyXGv0w gsicdbxSuu6SyN6tNoKCiZAa0tZNZY88wbDjGT4e6CyJx7cH/ckCRY8rhQR9miqK5fwU D1ToSw5DKXWCsVdH6KBilLasSRwQ5+JUi/UoMIP3WBYX4GWwa5X+9dAfhyLMh/PDQtAo GNZPvw7ESlAQ/tN6pKzFQwFvPmR6JtFIkwDmqS1hesuCUyyZ7Pczb8qtYIkAVmu/s1zl nM2n3ekAg2z/g9hHg5JZPY0EWuF0kHTe1AwTe8e+9svEN+d4jJ/r2Lm+wL3xDWEL6wx5 0fzQ== X-Gm-Message-State: AOAM531YlwafeofVKIdV/CNPdXvOa3hqj1hJ2sGHJYKcVTgKUjZ0Zmmm uNwJC9R9HkhIOh9RbrtLLNhhZYHkJ5I= X-Google-Smtp-Source: ABdhPJz0x9yZNQv7vUYfMpAzwqB995E0n05e555zf0N+UE2ZWp3D7jU5HKwPPBf9oZnz9WVAnNjKPw== X-Received: by 2002:a17:907:c09:: with SMTP id ga9mr25825292ejc.62.1640859409834; Thu, 30 Dec 2021 02:16:49 -0800 (PST) Received: from ernst.home (p5b3be0d9.dip0.t-ipconnect.de. [91.59.224.217]) by smtp.gmail.com with ESMTPSA id u21sm9420030eds.8.2021.12.30.02.16.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Dec 2021 02:16:49 -0800 (PST) Date: Thu, 30 Dec 2021 11:16:48 +0100 From: Gary Jennejohn To: Antoine Brodin Cc: Ed Maste , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Sergey Osokin Subject: Re: git: 6b1c5775d1c2 - main - Move libc++ from /usr/lib to /lib Message-ID: <20211230111648.1793a5a4@ernst.home> In-Reply-To: References: <202112291952.1BTJqq5J034681@gitrepo.freebsd.org> Reply-To: gljennjohn@gmail.com X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4JPkhf687Tz4nTW X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N On Thu, 30 Dec 2021 09:08:47 +0000 Antoine Brodin wrote: > On Wed, Dec 29, 2021 at 7:52 PM Ed Maste wrote: > > > > The branch main has been updated by emaste: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=6b1c5775d1c29c7c42201254df82aca9f3820bc8 > > > > commit 6b1c5775d1c29c7c42201254df82aca9f3820bc8 > > Author: Ed Maste > > AuthorDate: 2021-12-29 19:50:03 +0000 > > Commit: Ed Maste > > CommitDate: 2021-12-29 19:51:28 +0000 > > > > Move libc++ from /usr/lib to /lib > > > > As with other runtime components like libc or libcxxrt. > > > > If desired we can stop linking devd statically after this change (to > > achive approximately no net change in required root filesystem size). > > > > Reviewed by: imp > > Sponsored by: The FreeBSD Foundation > > Differential Revision: https://reviews.freebsd.org/D33123 > > --- > > ObsoleteFiles.inc | 3 +++ > > lib/libc++/Makefile | 1 + > > 2 files changed, 4 insertions(+) > > > > diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc > > index 4e99c917e89a..6207ad302bba 100644 > > --- a/ObsoleteFiles.inc > > +++ b/ObsoleteFiles.inc > > @@ -40,6 +40,9 @@ > > # xargs -n1 | sort | uniq -d; > > # done > > > > +# 20211229 libc++ moved to /lib > > +OLD_LIBS+=usr/lib/libc++.so.1 > > + > > # 20211221 efi_set_variables_supported.3 should be efi_variables_supported.3 > > OLD_FILES+=usr/share/man/man3/efi_set_variables_supported.3.gz > > > > diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile > > index 2bc1bf40eccd..f535a0cfba8c 100644 > > --- a/lib/libc++/Makefile > > +++ b/lib/libc++/Makefile > > @@ -3,6 +3,7 @@ > > .include > > > > PACKAGE= clibs > > +SHLIBDIR?= /lib > > _LIBCXXRTDIR= ${SRCTOP}/contrib/libcxxrt > > HDRDIR= ${SRCTOP}/contrib/llvm-project/libcxx/include > > SRCDIR= ${SRCTOP}/contrib/llvm-project/libcxx/src > > Hello, > > Something seems missing: > > # cc > ld-elf.so.1: Shared object "libc++.so.1" not found, required by "cc" > This is strange. I just did buildworld/installworld at main-n252047-f1d5e2c862e and cc works just fine for me. My /libexec/ld-elf.so.1 is from December 22nd, but it's identical to the ld-elf.so.1 which was built today (based on sum values). And my /usr/lib/libc++.so.1 was installed today. There's no /lib/libc++.so.1 on my system even though I had the modified Makefile when I did the buildworld/installworld. I don't delete old files using ObsoleteFiles.inc. Still, libc++.so.1 should be present in your obj directory and you can just copy it to /lib and/or /usr/lib as a temporary fix. -- Gary Jennejohn