| 1 |
commit: dfbc7e0999a86a9cfbd17577d22290cd4287e606 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 29 08:56:39 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 29 08:58:57 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfbc7e09 |
| 7 |
|
| 8 |
sys-libs/libcxxabi: Delay llvm.org_set_globals after vars |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild | 12 +++++++----- |
| 13 |
sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild | 12 +++++++----- |
| 14 |
2 files changed, 14 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild |
| 17 |
index 4b304417a9c..c1992223348 100644 |
| 18 |
--- a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild |
| 19 |
+++ b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild |
| 20 |
@@ -9,10 +9,6 @@ inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs |
| 21 |
|
| 22 |
DESCRIPTION="Low level support for a standard C++ library" |
| 23 |
HOMEPAGE="https://libcxxabi.llvm.org/" |
| 24 |
-# libcxx is needed uncondtionally for the headers |
| 25 |
-LLVM_COMPONENTS=( libcxx{abi,} ) |
| 26 |
-LLVM_TEST_COMPONENTS=( llvm/cmake ) |
| 27 |
-llvm.org_set_globals |
| 28 |
|
| 29 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 30 |
SLOT="0" |
| 31 |
@@ -32,7 +28,13 @@ DEPEND="${RDEPEND} |
| 32 |
>=sys-devel/llvm-6" |
| 33 |
BDEPEND=" |
| 34 |
test? ( >=sys-devel/clang-3.9.0 |
| 35 |
- $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" |
| 36 |
+ $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') |
| 37 |
+ )" |
| 38 |
+ |
| 39 |
+# libcxx is needed uncondtionally for the headers |
| 40 |
+LLVM_COMPONENTS=( libcxx{abi,} ) |
| 41 |
+LLVM_TEST_COMPONENTS=( llvm/cmake ) |
| 42 |
+llvm.org_set_globals |
| 43 |
|
| 44 |
python_check_deps() { |
| 45 |
has_version "dev-python/lit[${PYTHON_USEDEP}]" |
| 46 |
|
| 47 |
diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild |
| 48 |
index 4b304417a9c..c1992223348 100644 |
| 49 |
--- a/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild |
| 50 |
+++ b/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild |
| 51 |
@@ -9,10 +9,6 @@ inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs |
| 52 |
|
| 53 |
DESCRIPTION="Low level support for a standard C++ library" |
| 54 |
HOMEPAGE="https://libcxxabi.llvm.org/" |
| 55 |
-# libcxx is needed uncondtionally for the headers |
| 56 |
-LLVM_COMPONENTS=( libcxx{abi,} ) |
| 57 |
-LLVM_TEST_COMPONENTS=( llvm/cmake ) |
| 58 |
-llvm.org_set_globals |
| 59 |
|
| 60 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 61 |
SLOT="0" |
| 62 |
@@ -32,7 +28,13 @@ DEPEND="${RDEPEND} |
| 63 |
>=sys-devel/llvm-6" |
| 64 |
BDEPEND=" |
| 65 |
test? ( >=sys-devel/clang-3.9.0 |
| 66 |
- $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" |
| 67 |
+ $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') |
| 68 |
+ )" |
| 69 |
+ |
| 70 |
+# libcxx is needed uncondtionally for the headers |
| 71 |
+LLVM_COMPONENTS=( libcxx{abi,} ) |
| 72 |
+LLVM_TEST_COMPONENTS=( llvm/cmake ) |
| 73 |
+llvm.org_set_globals |
| 74 |
|
| 75 |
python_check_deps() { |
| 76 |
has_version "dev-python/lit[${PYTHON_USEDEP}]" |
Archives