| 1 |
commit: 46a2a8d90efe4cf8f29649263ecc4a13d542fe5d |
| 2 |
Author: Alex R <lyssdod <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jul 4 22:58:46 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 5 05:40:26 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46a2a8d9 |
| 7 |
|
| 8 |
sys-libs/libcxx: use gcc libatomic only with libgcc_s |
| 9 |
|
| 10 |
Signed-off-by: Alex Revin <lyssdod <AT> gmail.com> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/21516 |
| 12 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-libs/libcxx/libcxx-12.0.0.ebuild | 1 + |
| 15 |
sys-libs/libcxx/libcxx-12.0.1.9999.ebuild | 1 + |
| 16 |
sys-libs/libcxx/libcxx-12.0.1_rc2.ebuild | 1 + |
| 17 |
sys-libs/libcxx/libcxx-13.0.0.9999.ebuild | 1 + |
| 18 |
4 files changed, 4 insertions(+) |
| 19 |
|
| 20 |
diff --git a/sys-libs/libcxx/libcxx-12.0.0.ebuild b/sys-libs/libcxx/libcxx-12.0.0.ebuild |
| 21 |
index c5ca6ee892f..3463d022a19 100644 |
| 22 |
--- a/sys-libs/libcxx/libcxx-12.0.0.ebuild |
| 23 |
+++ b/sys-libs/libcxx/libcxx-12.0.0.ebuild |
| 24 |
@@ -140,6 +140,7 @@ multilib_src_configure() { |
| 25 |
-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s} |
| 26 |
-DLIBCXX_INCLUDE_TESTS=$(usex test) |
| 27 |
-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} |
| 28 |
+ -DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s} |
| 29 |
-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" |
| 30 |
) |
| 31 |
|
| 32 |
|
| 33 |
diff --git a/sys-libs/libcxx/libcxx-12.0.1.9999.ebuild b/sys-libs/libcxx/libcxx-12.0.1.9999.ebuild |
| 34 |
index 1f529867fb7..861d92b62c2 100644 |
| 35 |
--- a/sys-libs/libcxx/libcxx-12.0.1.9999.ebuild |
| 36 |
+++ b/sys-libs/libcxx/libcxx-12.0.1.9999.ebuild |
| 37 |
@@ -131,6 +131,7 @@ multilib_src_configure() { |
| 38 |
-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s} |
| 39 |
-DLIBCXX_INCLUDE_TESTS=$(usex test) |
| 40 |
-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} |
| 41 |
+ -DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s} |
| 42 |
-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" |
| 43 |
) |
| 44 |
|
| 45 |
|
| 46 |
diff --git a/sys-libs/libcxx/libcxx-12.0.1_rc2.ebuild b/sys-libs/libcxx/libcxx-12.0.1_rc2.ebuild |
| 47 |
index 1f529867fb7..861d92b62c2 100644 |
| 48 |
--- a/sys-libs/libcxx/libcxx-12.0.1_rc2.ebuild |
| 49 |
+++ b/sys-libs/libcxx/libcxx-12.0.1_rc2.ebuild |
| 50 |
@@ -131,6 +131,7 @@ multilib_src_configure() { |
| 51 |
-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s} |
| 52 |
-DLIBCXX_INCLUDE_TESTS=$(usex test) |
| 53 |
-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} |
| 54 |
+ -DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s} |
| 55 |
-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" |
| 56 |
) |
| 57 |
|
| 58 |
|
| 59 |
diff --git a/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild |
| 60 |
index 1f529867fb7..861d92b62c2 100644 |
| 61 |
--- a/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild |
| 62 |
+++ b/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild |
| 63 |
@@ -131,6 +131,7 @@ multilib_src_configure() { |
| 64 |
-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s} |
| 65 |
-DLIBCXX_INCLUDE_TESTS=$(usex test) |
| 66 |
-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} |
| 67 |
+ -DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s} |
| 68 |
-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" |
| 69 |
) |
Archives