commit: e69f3a4746de500271379aaa704124ecb3048f27 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Sep 13 20:38:53 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Sep 20 13:41:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e69f3a47
dev-ml/llvm-ocaml: Switch 13+ to new targets API Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild | 16 ++-------------- dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild | 16 ++-------------- dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild | 16 ++-------------- 3 files changed, 6 insertions(+), 42 deletions(-) diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild index d082ba50ed2..d0039fc6ae9 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild @@ -9,18 +9,10 @@ inherit cmake llvm llvm.org python-any-r1 DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/"; -# Keep in sync with sys-devel/llvm -ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE ) -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore - "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) - LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0/${PV}" KEYWORDS="" -IUSE="debug test ${ALL_LLVM_TARGETS[*]}" -REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" +IUSE="debug test" RESTRICT="!test? ( test )" RDEPEND=" @@ -28,11 +20,6 @@ RDEPEND=" dev-ml/ocaml-ctypes:= ~sys-devel/llvm-${PV}:=[debug?] !sys-devel/llvm[ocaml(-)]" -for x in "${ALL_LLVM_TARGETS[@]}"; do - RDEPEND+=" - ${x}? ( ~sys-devel/llvm-${PV}[${x}] )" -done -unset x DEPEND="${RDEPEND}" BDEPEND=" @@ -43,6 +30,7 @@ BDEPEND=" ${PYTHON_DEPS}" LLVM_COMPONENTS=( llvm ) +LLVM_USE_TARGETS=llvm llvm.org_set_globals pkg_setup() { diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild index d082ba50ed2..d0039fc6ae9 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild @@ -9,18 +9,10 @@ inherit cmake llvm llvm.org python-any-r1 DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/"; -# Keep in sync with sys-devel/llvm -ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE ) -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore - "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) - LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0/${PV}" KEYWORDS="" -IUSE="debug test ${ALL_LLVM_TARGETS[*]}" -REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" +IUSE="debug test" RESTRICT="!test? ( test )" RDEPEND=" @@ -28,11 +20,6 @@ RDEPEND=" dev-ml/ocaml-ctypes:= ~sys-devel/llvm-${PV}:=[debug?] !sys-devel/llvm[ocaml(-)]" -for x in "${ALL_LLVM_TARGETS[@]}"; do - RDEPEND+=" - ${x}? ( ~sys-devel/llvm-${PV}[${x}] )" -done -unset x DEPEND="${RDEPEND}" BDEPEND=" @@ -43,6 +30,7 @@ BDEPEND=" ${PYTHON_DEPS}" LLVM_COMPONENTS=( llvm ) +LLVM_USE_TARGETS=llvm llvm.org_set_globals pkg_setup() { diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild index d082ba50ed2..d0039fc6ae9 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild @@ -9,18 +9,10 @@ inherit cmake llvm llvm.org python-any-r1 DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/"; -# Keep in sync with sys-devel/llvm -ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE ) -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore - "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) - LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0/${PV}" KEYWORDS="" -IUSE="debug test ${ALL_LLVM_TARGETS[*]}" -REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" +IUSE="debug test" RESTRICT="!test? ( test )" RDEPEND=" @@ -28,11 +20,6 @@ RDEPEND=" dev-ml/ocaml-ctypes:= ~sys-devel/llvm-${PV}:=[debug?] !sys-devel/llvm[ocaml(-)]" -for x in "${ALL_LLVM_TARGETS[@]}"; do - RDEPEND+=" - ${x}? ( ~sys-devel/llvm-${PV}[${x}] )" -done -unset x DEPEND="${RDEPEND}" BDEPEND=" @@ -43,6 +30,7 @@ BDEPEND=" ${PYTHON_DEPS}" LLVM_COMPONENTS=( llvm ) +LLVM_USE_TARGETS=llvm llvm.org_set_globals pkg_setup() {
