| 1 |
commit: 78af59de8b0185f9784057eec1c9a25f1102d576 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 13 20:40:36 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 20 13:41:22 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78af59de |
| 7 |
|
| 8 |
sys-devel/clang: Switch 13+ to new targets API |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-devel/clang/clang-13.0.0.9999.ebuild | 18 +++--------------- |
| 13 |
sys-devel/clang/clang-13.0.0_rc2.ebuild | 18 +++--------------- |
| 14 |
sys-devel/clang/clang-14.0.0.9999.ebuild | 18 +++--------------- |
| 15 |
3 files changed, 9 insertions(+), 45 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-devel/clang/clang-13.0.0.9999.ebuild b/sys-devel/clang/clang-13.0.0.9999.ebuild |
| 18 |
index ee05f41d133..3c3e637a0d1 100644 |
| 19 |
--- a/sys-devel/clang/clang-13.0.0.9999.ebuild |
| 20 |
+++ b/sys-devel/clang/clang-13.0.0.9999.ebuild |
| 21 |
@@ -10,13 +10,6 @@ inherit cmake llvm llvm.org multilib multilib-minimal \ |
| 22 |
DESCRIPTION="C language family frontend 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 |
# MSVCSetupApi.h: MIT |
| 33 |
# sorttable.js: MIT |
| 34 |
|
| 35 |
@@ -24,9 +17,8 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT" |
| 36 |
SLOT="$(ver_cut 1)" |
| 37 |
KEYWORDS="" |
| 38 |
IUSE="debug default-compiler-rt default-libcxx default-lld |
| 39 |
- doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" |
| 40 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 41 |
- || ( ${ALL_LLVM_TARGETS[*]} )" |
| 42 |
+ doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD" |
| 43 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 44 |
RESTRICT="!test? ( test )" |
| 45 |
|
| 46 |
RDEPEND=" |
| 47 |
@@ -34,11 +26,6 @@ RDEPEND=" |
| 48 |
static-analyzer? ( dev-lang/perl:* ) |
| 49 |
xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) |
| 50 |
${PYTHON_DEPS}" |
| 51 |
-for x in "${ALL_LLVM_TARGETS[@]}"; do |
| 52 |
- RDEPEND+=" |
| 53 |
- ${x}? ( ~sys-devel/llvm-${PV}:${SLOT}[${x}] )" |
| 54 |
-done |
| 55 |
-unset x |
| 56 |
|
| 57 |
DEPEND="${RDEPEND}" |
| 58 |
BDEPEND=" |
| 59 |
@@ -65,6 +52,7 @@ LLVM_TEST_COMPONENTS=( |
| 60 |
llvm/utils/{UpdateTestChecks,update_cc_test_checks.py} |
| 61 |
) |
| 62 |
LLVM_PATCHSET=9999-2 |
| 63 |
+LLVM_USE_TARGETS=llvm |
| 64 |
llvm.org_set_globals |
| 65 |
|
| 66 |
# Multilib notes: |
| 67 |
|
| 68 |
diff --git a/sys-devel/clang/clang-13.0.0_rc2.ebuild b/sys-devel/clang/clang-13.0.0_rc2.ebuild |
| 69 |
index 6fdeef8243e..5003b7995d1 100644 |
| 70 |
--- a/sys-devel/clang/clang-13.0.0_rc2.ebuild |
| 71 |
+++ b/sys-devel/clang/clang-13.0.0_rc2.ebuild |
| 72 |
@@ -10,13 +10,6 @@ inherit cmake llvm llvm.org multilib multilib-minimal \ |
| 73 |
DESCRIPTION="C language family frontend for LLVM" |
| 74 |
HOMEPAGE="https://llvm.org/" |
| 75 |
|
| 76 |
-# Keep in sync with sys-devel/llvm |
| 77 |
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE ) |
| 78 |
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 |
| 79 |
- NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore |
| 80 |
- "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) |
| 81 |
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) |
| 82 |
- |
| 83 |
# MSVCSetupApi.h: MIT |
| 84 |
# sorttable.js: MIT |
| 85 |
|
| 86 |
@@ -24,9 +17,8 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT" |
| 87 |
SLOT="$(ver_cut 1)" |
| 88 |
KEYWORDS="" |
| 89 |
IUSE="debug default-compiler-rt default-libcxx default-lld |
| 90 |
- doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" |
| 91 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 92 |
- || ( ${ALL_LLVM_TARGETS[*]} )" |
| 93 |
+ doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD" |
| 94 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 95 |
RESTRICT="!test? ( test )" |
| 96 |
|
| 97 |
RDEPEND=" |
| 98 |
@@ -34,11 +26,6 @@ RDEPEND=" |
| 99 |
static-analyzer? ( dev-lang/perl:* ) |
| 100 |
xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) |
| 101 |
${PYTHON_DEPS}" |
| 102 |
-for x in "${ALL_LLVM_TARGETS[@]}"; do |
| 103 |
- RDEPEND+=" |
| 104 |
- ${x}? ( ~sys-devel/llvm-${PV}:${SLOT}[${x}] )" |
| 105 |
-done |
| 106 |
-unset x |
| 107 |
|
| 108 |
DEPEND="${RDEPEND}" |
| 109 |
BDEPEND=" |
| 110 |
@@ -65,6 +52,7 @@ LLVM_TEST_COMPONENTS=( |
| 111 |
llvm/utils/{UpdateTestChecks,update_cc_test_checks.py} |
| 112 |
) |
| 113 |
LLVM_PATCHSET=13.0.0-rc2 |
| 114 |
+LLVM_USE_TARGETS=llvm |
| 115 |
llvm.org_set_globals |
| 116 |
|
| 117 |
# Multilib notes: |
| 118 |
|
| 119 |
diff --git a/sys-devel/clang/clang-14.0.0.9999.ebuild b/sys-devel/clang/clang-14.0.0.9999.ebuild |
| 120 |
index ee05f41d133..3c3e637a0d1 100644 |
| 121 |
--- a/sys-devel/clang/clang-14.0.0.9999.ebuild |
| 122 |
+++ b/sys-devel/clang/clang-14.0.0.9999.ebuild |
| 123 |
@@ -10,13 +10,6 @@ inherit cmake llvm llvm.org multilib multilib-minimal \ |
| 124 |
DESCRIPTION="C language family frontend for LLVM" |
| 125 |
HOMEPAGE="https://llvm.org/" |
| 126 |
|
| 127 |
-# Keep in sync with sys-devel/llvm |
| 128 |
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE ) |
| 129 |
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 |
| 130 |
- NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore |
| 131 |
- "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) |
| 132 |
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) |
| 133 |
- |
| 134 |
# MSVCSetupApi.h: MIT |
| 135 |
# sorttable.js: MIT |
| 136 |
|
| 137 |
@@ -24,9 +17,8 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT" |
| 138 |
SLOT="$(ver_cut 1)" |
| 139 |
KEYWORDS="" |
| 140 |
IUSE="debug default-compiler-rt default-libcxx default-lld |
| 141 |
- doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" |
| 142 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 143 |
- || ( ${ALL_LLVM_TARGETS[*]} )" |
| 144 |
+ doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD" |
| 145 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 146 |
RESTRICT="!test? ( test )" |
| 147 |
|
| 148 |
RDEPEND=" |
| 149 |
@@ -34,11 +26,6 @@ RDEPEND=" |
| 150 |
static-analyzer? ( dev-lang/perl:* ) |
| 151 |
xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) |
| 152 |
${PYTHON_DEPS}" |
| 153 |
-for x in "${ALL_LLVM_TARGETS[@]}"; do |
| 154 |
- RDEPEND+=" |
| 155 |
- ${x}? ( ~sys-devel/llvm-${PV}:${SLOT}[${x}] )" |
| 156 |
-done |
| 157 |
-unset x |
| 158 |
|
| 159 |
DEPEND="${RDEPEND}" |
| 160 |
BDEPEND=" |
| 161 |
@@ -65,6 +52,7 @@ LLVM_TEST_COMPONENTS=( |
| 162 |
llvm/utils/{UpdateTestChecks,update_cc_test_checks.py} |
| 163 |
) |
| 164 |
LLVM_PATCHSET=9999-2 |
| 165 |
+LLVM_USE_TARGETS=llvm |
| 166 |
llvm.org_set_globals |
| 167 |
|
| 168 |
# Multilib notes: |
Archives