From nobody Thu Dec 30 15:26:45 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 6B48E191C596; Thu, 30 Dec 2021 15:26:46 +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 4JPsZG1Cw6z3qqt; Thu, 30 Dec 2021 15:26:46 +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 0A4B01AA7B; Thu, 30 Dec 2021 15:26:46 +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 1BUFQjTb097001; Thu, 30 Dec 2021 15:26:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BUFQj88097000; Thu, 30 Dec 2021 15:26:45 GMT (envelope-from git) Date: Thu, 30 Dec 2021 15:26:45 GMT Message-Id: <202112301526.1BUFQj88097000@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: b6f7942cbcbd - main - Revert "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: b6f7942cbcbde7c09788e86fdfe9310eafcb6e9f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640878006; 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=aUEtN504Vd63NCnBCDCF3Mc5PuZXCJZ+o1ZPJM2rM34=; b=O1dXSA/wSH4q/XDwpD8alW1k7LpIbd5DESMEFvKnLrXHznR9m22+YCZnqQKokIPrxMuD7M 8OZFIGXi9NVZ2ARanA4D10EL46ftNnupvUBYm40HnLD5CMUaDiebfQnFvgEHeaNHHgdwta H+/cepXkDLangfxSrO71HtRxq6vaq5Rz1Ztg/+exwyqJfNEWwJBErAprfkpa91FbcJtmYx rpj6xOJAm8UDTk51eo/9aswXPMvJQaB4xKSEpSs0h3XXsJrqFEEA89jEZ9IOgeW4eAqCFw kb9bArDp+3cF5KXgAImD22GNZ64AplApBbU1Wv5WTLrYHwb2ZdsZAe4UbDRt9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640878006; a=rsa-sha256; cv=none; b=qiVBgXYAC44HYopXRQ6I6PvZ8Pfm5CgQxDcY9bNA213F0UjyH0iEwOLACp52E9hrkyE3Uz qq/B5lp/Eg8vkKehuq8gkI4TSKysUnuwBh8RdOUuvggM6t+tIFiTp9Hfic86VGF8LXz1CX +X2ylhOIV/z0wNMtGp1lDmWwZyDV0/xHkFer6E/vhqhEO905MR/sntPiU3y4GIW/3AD+L4 LXmBkjWOH+dJHvqfDO+p33QM68oOqsJrnmZtMgLFcuChMnxwZk7ZkcjNFnG4N+dKaBQTD+ Tg68LG9hcaNL/2qGzm+LRqSOddN1Hier55ly56Z8eAB5bxbFSD+6EO5tL+xWYg== 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=b6f7942cbcbde7c09788e86fdfe9310eafcb6e9f commit b6f7942cbcbde7c09788e86fdfe9310eafcb6e9f Author: Ed Maste AuthorDate: 2021-12-30 15:25:08 +0000 Commit: Ed Maste CommitDate: 2021-12-30 15:25:58 +0000 Revert "Move libc++ from /usr/lib to /lib" This reverts commit 6b1c5775d1c29c7c42201254df82aca9f3820bc8. There are reports of errors with this change. Reported by: antoine --- ObsoleteFiles.inc | 3 --- lib/libc++/Makefile | 1 - 2 files changed, 4 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 6207ad302bba..4e99c917e89a 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -40,9 +40,6 @@ # 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 f535a0cfba8c..2bc1bf40eccd 100644 --- a/lib/libc++/Makefile +++ b/lib/libc++/Makefile @@ -3,7 +3,6 @@ .include PACKAGE= clibs -SHLIBDIR?= /lib _LIBCXXRTDIR= ${SRCTOP}/contrib/libcxxrt HDRDIR= ${SRCTOP}/contrib/llvm-project/libcxx/include SRCDIR= ${SRCTOP}/contrib/llvm-project/libcxx/src