From nobody Wed Dec 29 19:52:52 2021 X-Original-To: dev-commits-src-main@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 F17E1191B23C; Wed, 29 Dec 2021 19:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JPMWm4pdKz51gQ; Wed, 29 Dec 2021 19:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 855042E32; Wed, 29 Dec 2021 19:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BTJqqMV034682; Wed, 29 Dec 2021 19:52:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BTJqq5J034681; Wed, 29 Dec 2021 19:52:52 GMT (envelope-from git) Date: Wed, 29 Dec 2021 19:52:52 GMT Message-Id: <202112291952.1BTJqq5J034681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 6b1c5775d1c2 - main - Move libc++ from /usr/lib to /lib List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b1c5775d1c29c7c42201254df82aca9f3820bc8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640807572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GrOwvMWqaRVsCOaSNFph3z010ObcFXYo0OCAr5ovHYs=; b=dDTlqf3hy2cniy2fu4+4zehJPmbHs9uiiv77tuEXQEFscw7gYflwxGPs/S5+xsXi3Rpx+a T0FMF7S6qcXuASKdHD+mGzESEn5jj4Wi0S5cYCvFhK717cnKlnKM6GT0xlPJsju/xbzD+r 49tu8NuXQQB98jfSnyz952yK3imoF2cDhdmVqWbF/PgiYDE4js8nhomv+Uydt6UJOulYkm D2n0zZzGmDasAYN6pv18DXPjo4PrFXZrEXJ5CCTtHwiVQEk4HIDeohNN45iSdqOSwtjtk9 KwSeToqTP6bSuB35N/klh+0uKN8OpjRZLHhqi819YjHaa/NkiK3b67/bS8qcHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640807572; a=rsa-sha256; cv=none; b=ukaZrL4qN3UZ2kuSTGkchfeMPQh9dBsTyz/aES7cDDzGBO5REk6TUT0zo0ijnKZtObONyo 8As+4eE1IZTn915In4kAQ3hYKcc3/kbjRKFGTEmYpuiPC8EuEkCuutHXRNl081qqppX8LL pVjsb1Au0Jpgkia+dDOKXm074lS1FcIAFvFTlB9E/OahKl8QCYBMHGfqiXuYlOehCASB+8 oAtABPU2G8kZGiEBfVLuh7BpVrPzUJWpTKnDY8eE0BQ/52FnxOBb9Fg5fWu0UC2lAKN7wA jh/wdYs177clyQZCDkZpEI2sQxyyttMben4MP9FXdYDt+Os8CkSnAaqMJ7LZsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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