Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/llvm-ocaml/
Date: Tue, 09 Jan 2018 14:34:51
Message-Id: 1515508478.58a1b23930ef05cc25f854b38fc3b685282e05d9.mgorny@gentoo
1 commit: 58a1b23930ef05cc25f854b38fc3b685282e05d9
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 9 14:31:18 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 9 14:34:38 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58a1b239
7
8 dev-ml/llvm-ocaml: Disable experimental targets on the release branch
9
10 dev-ml/llvm-ocaml/llvm-ocaml-6.0.9999.ebuild | 9 ++-------
11 1 file changed, 2 insertions(+), 7 deletions(-)
12
13 diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-6.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-6.0.9999.ebuild
14 index b8960469aed..456fff53311 100644
15 --- a/dev-ml/llvm-ocaml/llvm-ocaml-6.0.9999.ebuild
16 +++ b/dev-ml/llvm-ocaml/llvm-ocaml-6.0.9999.ebuild
17 @@ -18,10 +18,8 @@ EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
18 EGIT_BRANCH="release_60"
19
20 # Keep in sync with sys-devel/llvm
21 -ALL_LLVM_EXPERIMENTAL_TARGETS=( AVR Nios2 RISCV WebAssembly )
22 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
23 - NVPTX PowerPC Sparc SystemZ X86 XCore
24 - "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
25 + NVPTX PowerPC Sparc SystemZ X86 XCore )
26 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
27 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
28
29 @@ -69,10 +67,7 @@ src_configure() {
30
31 -DBUILD_SHARED_LIBS=ON
32 -DLLVM_OCAML_OUT_OF_TREE=ON
33 - # cheap hack: LLVM combines both anyway, and the only difference
34 - # is that the former list is explicitly verified at cmake time
35 - -DLLVM_TARGETS_TO_BUILD=""
36 - -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
37 + -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
38 -DLLVM_BUILD_TESTS=$(usex test)
39
40 # disable various irrelevant deps and settings