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: sys-devel/llvm/
Date: Tue, 09 Jan 2018 14:34:48
Message-Id: 1515508479.d228da4ab9e46092f1a65b1fd7d1ad7a6c0f46e7.mgorny@gentoo
1 commit: d228da4ab9e46092f1a65b1fd7d1ad7a6c0f46e7
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 9 14:32:17 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 9 14:34:39 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d228da4a
7
8 sys-devel/llvm: Remove experimental targets from the release branch
9
10 sys-devel/llvm/llvm-6.0.9999.ebuild | 10 ++--------
11 1 file changed, 2 insertions(+), 8 deletions(-)
12
13 diff --git a/sys-devel/llvm/llvm-6.0.9999.ebuild b/sys-devel/llvm/llvm-6.0.9999.ebuild
14 index 0164813c3fc..c349ca3d09a 100644
15 --- a/sys-devel/llvm/llvm-6.0.9999.ebuild
16 +++ b/sys-devel/llvm/llvm-6.0.9999.ebuild
17 @@ -18,12 +18,9 @@ EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
18 https://github.com/llvm-mirror/llvm.git"
19 EGIT_BRANCH="release_60"
20
21 -# Those are in lib/Targets, without explicit CMakeLists.txt mention
22 -ALL_LLVM_EXPERIMENTAL_TARGETS=( AVR Nios2 RISCV WebAssembly )
23 # Keep in sync with CMakeLists.txt
24 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
25 - NVPTX PowerPC Sparc SystemZ X86 XCore
26 - "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
27 + NVPTX PowerPC Sparc SystemZ X86 XCore )
28 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
29
30 # Additional licenses:
31 @@ -102,10 +99,7 @@ multilib_src_configure() {
32 -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
33
34 -DBUILD_SHARED_LIBS=ON
35 - # cheap hack: LLVM combines both anyway, and the only difference
36 - # is that the former list is explicitly verified at cmake time
37 - -DLLVM_TARGETS_TO_BUILD=""
38 - -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
39 + -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
40 -DLLVM_BUILD_TESTS=$(usex test)
41
42 -DLLVM_ENABLE_FFI=$(usex libffi)