commit:     2c5538f6bd07db276eaa707e95b46e4f91fe15c5
Author:     Jacob Floyd <cognifloyd <AT> gmail <DOT> com>
AuthorDate: Sun Dec 27 19:07:11 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <cognifloyd <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18840
Signed-off-by: Sam James <sam <AT> 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() {

Reply via email to