commit: d4a10a7e6bb4d32fe42936dc3e97cabae0ffe64b Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Mar 16 16:55:03 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Mar 16 17:08:51 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4a10a7e
sys-devel/clang-runtime: Account for slotted sys-libs/libomp Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> .../clang-runtime/clang-runtime-15.0.7-r1.ebuild | 26 ++++++++++++++++++++++ ....9999.ebuild => clang-runtime-16.0.6-r1.ebuild} | 3 ++- ....9999.ebuild => clang-runtime-17.0.6-r1.ebuild} | 3 ++- ....9999.ebuild => clang-runtime-18.1.0-r1.ebuild} | 3 ++- .../clang-runtime/clang-runtime-19.0.0.9999.ebuild | 2 +- ... => clang-runtime-19.0.0_pre20240316-r1.ebuild} | 2 +- 6 files changed, 34 insertions(+), 5 deletions(-) diff --git a/sys-devel/clang-runtime/clang-runtime-15.0.7-r1.ebuild b/sys-devel/clang-runtime/clang-runtime-15.0.7-r1.ebuild new file mode 100644 index 000000000000..2c775a8cbbb8 --- /dev/null +++ b/sys-devel/clang-runtime/clang-runtime-15.0.7-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-build + +DESCRIPTION="Meta-ebuild for clang runtime libraries" +HOMEPAGE="https://clang.llvm.org/"; + +LICENSE="metapackage" +SLOT="$(ver_cut 1-3)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos" +IUSE="+compiler-rt libcxx openmp +sanitize" +REQUIRED_USE="sanitize? ( compiler-rt )" + +RDEPEND=" + compiler-rt? ( + ~sys-libs/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?] + sanitize? ( + ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?] + ) + ) + libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) + openmp? ( >=sys-libs/libomp-${PV}:${PV%%.*}[${MULTILIB_USEDEP}] ) +" diff --git a/sys-devel/clang-runtime/clang-runtime-19.0.0.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-16.0.6-r1.ebuild similarity index 87% copy from sys-devel/clang-runtime/clang-runtime-19.0.0.9999.ebuild copy to sys-devel/clang-runtime/clang-runtime-16.0.6-r1.ebuild index 323c0b62c062..04961060832f 100644 --- a/sys-devel/clang-runtime/clang-runtime-19.0.0.9999.ebuild +++ b/sys-devel/clang-runtime/clang-runtime-16.0.6-r1.ebuild @@ -10,6 +10,7 @@ HOMEPAGE="https://clang.llvm.org/"; LICENSE="metapackage" SLOT="${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos" IUSE="+compiler-rt libcxx openmp +sanitize" REQUIRED_USE="sanitize? ( compiler-rt )" @@ -21,7 +22,7 @@ RDEPEND=" ) ) libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) - openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] ) + openmp? ( >=sys-libs/libomp-${PV}:${SLOT}[${MULTILIB_USEDEP}] ) " pkg_pretend() { diff --git a/sys-devel/clang-runtime/clang-runtime-19.0.0.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-17.0.6-r1.ebuild similarity index 87% copy from sys-devel/clang-runtime/clang-runtime-19.0.0.9999.ebuild copy to sys-devel/clang-runtime/clang-runtime-17.0.6-r1.ebuild index 323c0b62c062..04961060832f 100644 --- a/sys-devel/clang-runtime/clang-runtime-19.0.0.9999.ebuild +++ b/sys-devel/clang-runtime/clang-runtime-17.0.6-r1.ebuild @@ -10,6 +10,7 @@ HOMEPAGE="https://clang.llvm.org/"; LICENSE="metapackage" SLOT="${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos" IUSE="+compiler-rt libcxx openmp +sanitize" REQUIRED_USE="sanitize? ( compiler-rt )" @@ -21,7 +22,7 @@ RDEPEND=" ) ) libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) - openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] ) + openmp? ( >=sys-libs/libomp-${PV}:${SLOT}[${MULTILIB_USEDEP}] ) " pkg_pretend() { diff --git a/sys-devel/clang-runtime/clang-runtime-19.0.0.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-18.1.0-r1.ebuild similarity index 87% copy from sys-devel/clang-runtime/clang-runtime-19.0.0.9999.ebuild copy to sys-devel/clang-runtime/clang-runtime-18.1.0-r1.ebuild index 323c0b62c062..04961060832f 100644 --- a/sys-devel/clang-runtime/clang-runtime-19.0.0.9999.ebuild +++ b/sys-devel/clang-runtime/clang-runtime-18.1.0-r1.ebuild @@ -10,6 +10,7 @@ HOMEPAGE="https://clang.llvm.org/"; LICENSE="metapackage" SLOT="${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos" IUSE="+compiler-rt libcxx openmp +sanitize" REQUIRED_USE="sanitize? ( compiler-rt )" @@ -21,7 +22,7 @@ RDEPEND=" ) ) libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) - openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] ) + openmp? ( >=sys-libs/libomp-${PV}:${SLOT}[${MULTILIB_USEDEP}] ) " pkg_pretend() { diff --git a/sys-devel/clang-runtime/clang-runtime-19.0.0.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-19.0.0.9999.ebuild index 323c0b62c062..939ca623fe07 100644 --- a/sys-devel/clang-runtime/clang-runtime-19.0.0.9999.ebuild +++ b/sys-devel/clang-runtime/clang-runtime-19.0.0.9999.ebuild @@ -21,7 +21,7 @@ RDEPEND=" ) ) libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) - openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] ) + openmp? ( >=sys-libs/libomp-${PV}:${SLOT}[${MULTILIB_USEDEP}] ) " pkg_pretend() { diff --git a/sys-devel/clang-runtime/clang-runtime-19.0.0.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-19.0.0_pre20240316-r1.ebuild similarity index 95% copy from sys-devel/clang-runtime/clang-runtime-19.0.0.9999.ebuild copy to sys-devel/clang-runtime/clang-runtime-19.0.0_pre20240316-r1.ebuild index 323c0b62c062..939ca623fe07 100644 --- a/sys-devel/clang-runtime/clang-runtime-19.0.0.9999.ebuild +++ b/sys-devel/clang-runtime/clang-runtime-19.0.0_pre20240316-r1.ebuild @@ -21,7 +21,7 @@ RDEPEND=" ) ) libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) - openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] ) + openmp? ( >=sys-libs/libomp-${PV}:${SLOT}[${MULTILIB_USEDEP}] ) " pkg_pretend() {
