commit: dfbc7e0999a86a9cfbd17577d22290cd4287e606 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Nov 29 08:56:39 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Nov 29 08:58:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfbc7e09
sys-libs/libcxxabi: Delay llvm.org_set_globals after vars Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild | 12 +++++++----- sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild index 4b304417a9c..c1992223348 100644 --- a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild @@ -9,10 +9,6 @@ inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs DESCRIPTION="Low level support for a standard C++ library" HOMEPAGE="https://libcxxabi.llvm.org/"; -# libcxx is needed uncondtionally for the headers -LLVM_COMPONENTS=( libcxx{abi,} ) -LLVM_TEST_COMPONENTS=( llvm/cmake ) -llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" @@ -32,7 +28,13 @@ DEPEND="${RDEPEND} >=sys-devel/llvm-6" BDEPEND=" test? ( >=sys-devel/clang-3.9.0 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" + $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') + )" + +# libcxx is needed uncondtionally for the headers +LLVM_COMPONENTS=( libcxx{abi,} ) +LLVM_TEST_COMPONENTS=( llvm/cmake ) +llvm.org_set_globals python_check_deps() { has_version "dev-python/lit[${PYTHON_USEDEP}]" diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild index 4b304417a9c..c1992223348 100644 --- a/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild @@ -9,10 +9,6 @@ inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs DESCRIPTION="Low level support for a standard C++ library" HOMEPAGE="https://libcxxabi.llvm.org/"; -# libcxx is needed uncondtionally for the headers -LLVM_COMPONENTS=( libcxx{abi,} ) -LLVM_TEST_COMPONENTS=( llvm/cmake ) -llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" @@ -32,7 +28,13 @@ DEPEND="${RDEPEND} >=sys-devel/llvm-6" BDEPEND=" test? ( >=sys-devel/clang-3.9.0 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" + $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') + )" + +# libcxx is needed uncondtionally for the headers +LLVM_COMPONENTS=( libcxx{abi,} ) +LLVM_TEST_COMPONENTS=( llvm/cmake ) +llvm.org_set_globals python_check_deps() { has_version "dev-python/lit[${PYTHON_USEDEP}]"
