| 1 |
commit: e69f3a4746de500271379aaa704124ecb3048f27 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 13 20:38:53 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 20 13:41:21 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e69f3a47 |
| 7 |
|
| 8 |
dev-ml/llvm-ocaml: Switch 13+ to new targets API |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild | 16 ++-------------- |
| 13 |
dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild | 16 ++-------------- |
| 14 |
dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild | 16 ++-------------- |
| 15 |
3 files changed, 6 insertions(+), 42 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
index d082ba50ed2..d0039fc6ae9 100644 |
| 19 |
--- a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild |
| 20 |
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild |
| 21 |
@@ -9,18 +9,10 @@ inherit cmake llvm llvm.org python-any-r1 |
| 22 |
DESCRIPTION="OCaml bindings for LLVM" |
| 23 |
HOMEPAGE="https://llvm.org/" |
| 24 |
|
| 25 |
-# Keep in sync with sys-devel/llvm |
| 26 |
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE ) |
| 27 |
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 |
| 28 |
- NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore |
| 29 |
- "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) |
| 30 |
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) |
| 31 |
- |
| 32 |
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" |
| 33 |
SLOT="0/${PV}" |
| 34 |
KEYWORDS="" |
| 35 |
-IUSE="debug test ${ALL_LLVM_TARGETS[*]}" |
| 36 |
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" |
| 37 |
+IUSE="debug test" |
| 38 |
RESTRICT="!test? ( test )" |
| 39 |
|
| 40 |
RDEPEND=" |
| 41 |
@@ -28,11 +20,6 @@ RDEPEND=" |
| 42 |
dev-ml/ocaml-ctypes:= |
| 43 |
~sys-devel/llvm-${PV}:=[debug?] |
| 44 |
!sys-devel/llvm[ocaml(-)]" |
| 45 |
-for x in "${ALL_LLVM_TARGETS[@]}"; do |
| 46 |
- RDEPEND+=" |
| 47 |
- ${x}? ( ~sys-devel/llvm-${PV}[${x}] )" |
| 48 |
-done |
| 49 |
-unset x |
| 50 |
|
| 51 |
DEPEND="${RDEPEND}" |
| 52 |
BDEPEND=" |
| 53 |
@@ -43,6 +30,7 @@ BDEPEND=" |
| 54 |
${PYTHON_DEPS}" |
| 55 |
|
| 56 |
LLVM_COMPONENTS=( llvm ) |
| 57 |
+LLVM_USE_TARGETS=llvm |
| 58 |
llvm.org_set_globals |
| 59 |
|
| 60 |
pkg_setup() { |
| 61 |
|
| 62 |
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 |
| 63 |
index d082ba50ed2..d0039fc6ae9 100644 |
| 64 |
--- a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild |
| 65 |
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild |
| 66 |
@@ -9,18 +9,10 @@ inherit cmake llvm llvm.org python-any-r1 |
| 67 |
DESCRIPTION="OCaml bindings for LLVM" |
| 68 |
HOMEPAGE="https://llvm.org/" |
| 69 |
|
| 70 |
-# Keep in sync with sys-devel/llvm |
| 71 |
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE ) |
| 72 |
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 |
| 73 |
- NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore |
| 74 |
- "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) |
| 75 |
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) |
| 76 |
- |
| 77 |
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" |
| 78 |
SLOT="0/${PV}" |
| 79 |
KEYWORDS="" |
| 80 |
-IUSE="debug test ${ALL_LLVM_TARGETS[*]}" |
| 81 |
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" |
| 82 |
+IUSE="debug test" |
| 83 |
RESTRICT="!test? ( test )" |
| 84 |
|
| 85 |
RDEPEND=" |
| 86 |
@@ -28,11 +20,6 @@ RDEPEND=" |
| 87 |
dev-ml/ocaml-ctypes:= |
| 88 |
~sys-devel/llvm-${PV}:=[debug?] |
| 89 |
!sys-devel/llvm[ocaml(-)]" |
| 90 |
-for x in "${ALL_LLVM_TARGETS[@]}"; do |
| 91 |
- RDEPEND+=" |
| 92 |
- ${x}? ( ~sys-devel/llvm-${PV}[${x}] )" |
| 93 |
-done |
| 94 |
-unset x |
| 95 |
|
| 96 |
DEPEND="${RDEPEND}" |
| 97 |
BDEPEND=" |
| 98 |
@@ -43,6 +30,7 @@ BDEPEND=" |
| 99 |
${PYTHON_DEPS}" |
| 100 |
|
| 101 |
LLVM_COMPONENTS=( llvm ) |
| 102 |
+LLVM_USE_TARGETS=llvm |
| 103 |
llvm.org_set_globals |
| 104 |
|
| 105 |
pkg_setup() { |
| 106 |
|
| 107 |
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 |
| 108 |
index d082ba50ed2..d0039fc6ae9 100644 |
| 109 |
--- a/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild |
| 110 |
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild |
| 111 |
@@ -9,18 +9,10 @@ inherit cmake llvm llvm.org python-any-r1 |
| 112 |
DESCRIPTION="OCaml bindings for LLVM" |
| 113 |
HOMEPAGE="https://llvm.org/" |
| 114 |
|
| 115 |
-# Keep in sync with sys-devel/llvm |
| 116 |
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE ) |
| 117 |
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 |
| 118 |
- NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore |
| 119 |
- "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) |
| 120 |
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) |
| 121 |
- |
| 122 |
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" |
| 123 |
SLOT="0/${PV}" |
| 124 |
KEYWORDS="" |
| 125 |
-IUSE="debug test ${ALL_LLVM_TARGETS[*]}" |
| 126 |
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" |
| 127 |
+IUSE="debug test" |
| 128 |
RESTRICT="!test? ( test )" |
| 129 |
|
| 130 |
RDEPEND=" |
| 131 |
@@ -28,11 +20,6 @@ RDEPEND=" |
| 132 |
dev-ml/ocaml-ctypes:= |
| 133 |
~sys-devel/llvm-${PV}:=[debug?] |
| 134 |
!sys-devel/llvm[ocaml(-)]" |
| 135 |
-for x in "${ALL_LLVM_TARGETS[@]}"; do |
| 136 |
- RDEPEND+=" |
| 137 |
- ${x}? ( ~sys-devel/llvm-${PV}[${x}] )" |
| 138 |
-done |
| 139 |
-unset x |
| 140 |
|
| 141 |
DEPEND="${RDEPEND}" |
| 142 |
BDEPEND=" |
| 143 |
@@ -43,6 +30,7 @@ BDEPEND=" |
| 144 |
${PYTHON_DEPS}" |
| 145 |
|
| 146 |
LLVM_COMPONENTS=( llvm ) |
| 147 |
+LLVM_USE_TARGETS=llvm |
| 148 |
llvm.org_set_globals |
| 149 |
|
| 150 |
pkg_setup() { |
Archives