From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 75E041382C5 for ; Sun, 27 Dec 2020 19:13:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A07F2E0D54; Sun, 27 Dec 2020 19:13:01 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7988AE0D54 for ; Sun, 27 Dec 2020 19:13:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1B37234158A for ; Sun, 27 Dec 2020 19:13:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D10944D for ; Sun, 27 Dec 2020 19:12:58 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1609096371.2c5538f6bd07db276eaa707e95b46e4f91fe15c5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcxx/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libcxx/libcxx-11.0.0.ebuild sys-libs/libcxx/libcxx-11.0.1.9999.ebuild sys-libs/libcxx/libcxx-11.0.1_rc1.ebuild sys-libs/libcxx/libcxx-11.0.1_rc2.ebuild sys-libs/libcxx/libcxx-12.0.0.9999.ebuild X-VCS-Directories: sys-libs/libcxx/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2c5538f6bd07db276eaa707e95b46e4f91fe15c5 X-VCS-Branch: master Date: Sun, 27 Dec 2020 19:12:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 01a44fb1-8fb7-439f-9f01-96da865325da X-Archives-Hash: 2420b7aba82a67e7dc24398ba2a2ef29 commit: 2c5538f6bd07db276eaa707e95b46e4f91fe15c5 Author: Jacob Floyd gmail com> AuthorDate: Sun Dec 27 19:07:11 2020 +0000 Commit: Sam James gentoo org> CommitDate: Sun Dec 27 19:12:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c5538f6 sys-libs/libcxx: fix "lib/CMakeLists.txt not found" This partially reverts 74c82761ee2b2145fc03019edb187869f6856a38 I missed that this file no longer exists, and the hard-coded reference is not in any of the current libcxx sources. Why it didn't fail when building this in my darwin prefix, I don't know. Closes: https://bugs.gentoo.org/761921 Signed-off-by: Jacob Floyd gmail.com> Closes: https://github.com/gentoo/gentoo/pull/18840 Signed-off-by: Sam James gentoo.org> sys-libs/libcxx/libcxx-11.0.0.ebuild | 4 ---- sys-libs/libcxx/libcxx-11.0.1.9999.ebuild | 4 ---- sys-libs/libcxx/libcxx-11.0.1_rc1.ebuild | 4 ---- sys-libs/libcxx/libcxx-11.0.1_rc2.ebuild | 4 ---- sys-libs/libcxx/libcxx-12.0.0.9999.ebuild | 4 ---- 5 files changed, 20 deletions(-) diff --git a/sys-libs/libcxx/libcxx-11.0.0.ebuild b/sys-libs/libcxx/libcxx-11.0.0.ebuild index cb077d76d64..b2203171221 100644 --- a/sys-libs/libcxx/libcxx-11.0.0.ebuild +++ b/sys-libs/libcxx/libcxx-11.0.0.ebuild @@ -62,10 +62,6 @@ src_prepare() { eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch" llvm.org_src_prepare - - # eprefixify static path references to libc++abi for symbol re-export to - # avoid linking against it twice in both /usr/lib and ${EPREFIX}/usr/lib - sed -i -e "s^/usr/lib/libc++abi.dylib^${EPREFIX}&^g" lib/CMakeLists.txt || die } test_compiler() { diff --git a/sys-libs/libcxx/libcxx-11.0.1.9999.ebuild b/sys-libs/libcxx/libcxx-11.0.1.9999.ebuild index 8d2f6ea8621..c088e18cceb 100644 --- a/sys-libs/libcxx/libcxx-11.0.1.9999.ebuild +++ b/sys-libs/libcxx/libcxx-11.0.1.9999.ebuild @@ -63,10 +63,6 @@ src_prepare() { eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch" llvm.org_src_prepare - - # eprefixify static path references to libc++abi for symbol re-export to - # avoid linking against it twice in both /usr/lib and ${EPREFIX}/usr/lib - sed -i -e "s^/usr/lib/libc++abi.dylib^${EPREFIX}&^g" lib/CMakeLists.txt || die } test_compiler() { diff --git a/sys-libs/libcxx/libcxx-11.0.1_rc1.ebuild b/sys-libs/libcxx/libcxx-11.0.1_rc1.ebuild index 8d2f6ea8621..c088e18cceb 100644 --- a/sys-libs/libcxx/libcxx-11.0.1_rc1.ebuild +++ b/sys-libs/libcxx/libcxx-11.0.1_rc1.ebuild @@ -63,10 +63,6 @@ src_prepare() { eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch" llvm.org_src_prepare - - # eprefixify static path references to libc++abi for symbol re-export to - # avoid linking against it twice in both /usr/lib and ${EPREFIX}/usr/lib - sed -i -e "s^/usr/lib/libc++abi.dylib^${EPREFIX}&^g" lib/CMakeLists.txt || die } test_compiler() { diff --git a/sys-libs/libcxx/libcxx-11.0.1_rc2.ebuild b/sys-libs/libcxx/libcxx-11.0.1_rc2.ebuild index 8d2f6ea8621..c088e18cceb 100644 --- a/sys-libs/libcxx/libcxx-11.0.1_rc2.ebuild +++ b/sys-libs/libcxx/libcxx-11.0.1_rc2.ebuild @@ -63,10 +63,6 @@ src_prepare() { eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch" llvm.org_src_prepare - - # eprefixify static path references to libc++abi for symbol re-export to - # avoid linking against it twice in both /usr/lib and ${EPREFIX}/usr/lib - sed -i -e "s^/usr/lib/libc++abi.dylib^${EPREFIX}&^g" lib/CMakeLists.txt || die } test_compiler() { diff --git a/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild index 8d2f6ea8621..c088e18cceb 100644 --- a/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild +++ b/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild @@ -63,10 +63,6 @@ src_prepare() { eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch" llvm.org_src_prepare - - # eprefixify static path references to libc++abi for symbol re-export to - # avoid linking against it twice in both /usr/lib and ${EPREFIX}/usr/lib - sed -i -e "s^/usr/lib/libc++abi.dylib^${EPREFIX}&^g" lib/CMakeLists.txt || die } test_compiler() {