commit: 94ebfe3225cc3753d6b6b2a170d084ef38ef22c3 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Sep 11 18:05:59 2022 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Sep 11 18:12:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94ebfe32
sys-libs/compiler-rt: Force matching LLVM version Closes: https://bugs.gentoo.org/869620 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild | 12 ++++++------ sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild | 11 +++++------ sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild | 11 +++++------ sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild | 11 +++++------ sys-libs/compiler-rt/compiler-rt-15.0.0.ebuild | 11 +++++------ sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild | 11 +++++------ 6 files changed, 31 insertions(+), 36 deletions(-) diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild index 6de6eb7c2d78..5479e8167692 100644 --- a/sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild @@ -15,16 +15,16 @@ KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos" IUSE="+abi_x86_32 abi_x86_64 +clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" -CLANG_SLOT=${SLOT%%.*} -# llvm-6 for new lit options +LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - >=sys-devel/llvm-6" + sys-devel/llvm:${LLVM_MAX_SLOT} +" BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} ) !test? ( ${PYTHON_DEPS} @@ -121,8 +121,8 @@ src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" ) fi diff --git a/sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild b/sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild index 7493e7480ff1..5a8467294d23 100644 --- a/sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild @@ -15,17 +15,16 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-mac IUSE="+abi_x86_32 abi_x86_64 +clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" -CLANG_SLOT=${SLOT%%.*} -# llvm-6 for new lit options +LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - >=sys-devel/llvm-6 + sys-devel/llvm:${LLVM_MAX_SLOT} " BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} ) !test? ( ${PYTHON_DEPS} @@ -136,8 +135,8 @@ src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" ) fi diff --git a/sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild b/sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild index f6cf92a36424..bad0285aefbc 100644 --- a/sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild @@ -15,17 +15,16 @@ KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos" IUSE="+abi_x86_32 abi_x86_64 +clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" -CLANG_SLOT=${SLOT%%.*} -# llvm-6 for new lit options +LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - >=sys-devel/llvm-6 + sys-devel/llvm:${LLVM_MAX_SLOT} " BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} ) !test? ( ${PYTHON_DEPS} @@ -127,8 +126,8 @@ src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" ) fi diff --git a/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild index a7b7ace68705..236d4a319ccf 100644 --- a/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild @@ -15,17 +15,16 @@ KEYWORDS="" IUSE="+abi_x86_32 abi_x86_64 +clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" -CLANG_SLOT=${SLOT%%.*} -# llvm-6 for new lit options +LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - >=sys-devel/llvm-6 + sys-devel/llvm:${LLVM_MAX_SLOT} " BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} ) !test? ( ${PYTHON_DEPS} @@ -136,8 +135,8 @@ src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" ) fi diff --git a/sys-libs/compiler-rt/compiler-rt-15.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-15.0.0.ebuild index f4fd6ab4b702..68720a38d8fa 100644 --- a/sys-libs/compiler-rt/compiler-rt-15.0.0.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-15.0.0.ebuild @@ -15,17 +15,16 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-mac IUSE="+abi_x86_32 abi_x86_64 +clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" -CLANG_SLOT=${SLOT%%.*} -# llvm-6 for new lit options +LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - >=sys-devel/llvm-6 + sys-devel/llvm:${LLVM_MAX_SLOT} " BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} ) !test? ( ${PYTHON_DEPS} @@ -136,8 +135,8 @@ src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" ) fi diff --git a/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild index a7b7ace68705..236d4a319ccf 100644 --- a/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild @@ -15,17 +15,16 @@ KEYWORDS="" IUSE="+abi_x86_32 abi_x86_64 +clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" -CLANG_SLOT=${SLOT%%.*} -# llvm-6 for new lit options +LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - >=sys-devel/llvm-6 + sys-devel/llvm:${LLVM_MAX_SLOT} " BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} ) !test? ( ${PYTHON_DEPS} @@ -136,8 +135,8 @@ src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" ) fi
