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/clang/
Date: Thu, 29 Sep 2016 14:13:28
Message-Id: 1475158380.f7c5c167f9202aefedeee67a779322bc0663e0e8.mgorny@gentoo
1 commit: f7c5c167f9202aefedeee67a779322bc0663e0e8
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 24 19:42:23 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 29 14:13:00 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7c5c167
7
8 sys-devel/clang: Use LLVM_TARGETS flags
9
10 sys-devel/clang/clang-9999.ebuild | 24 ++++++++++++------------
11 1 file changed, 12 insertions(+), 12 deletions(-)
12
13 diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
14 index d13919f..61a172b 100644
15 --- a/sys-devel/clang/clang-9999.ebuild
16 +++ b/sys-devel/clang/clang-9999.ebuild
17 @@ -17,14 +17,20 @@ SRC_URI=""
18 EGIT_REPO_URI="http://llvm.org/git/clang.git
19 https://github.com/llvm-mirror/clang.git"
20
21 +# Keep in sync with sys-devel/llvm
22 +ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
23 + NVPTX PowerPC Sparc SystemZ X86 XCore )
24 +ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
25 +LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
26 +
27 LICENSE="UoI-NCSA"
28 SLOT="0/${PV%.*}"
29 KEYWORDS=""
30 IUSE="debug default-compiler-rt default-libcxx +doc multitarget python
31 - +static-analyzer test xml video_cards_radeon elibc_musl kernel_FreeBSD"
32 + +static-analyzer test xml elibc_musl kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
33
34 RDEPEND="
35 - ~sys-devel/llvm-${PV}:=[debug=,multitarget?,video_cards_radeon?,${MULTILIB_USEDEP}]
36 + ~sys-devel/llvm-${PV}:=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
37 static-analyzer? ( dev-lang/perl:* )
38 xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
39 !<sys-devel/llvm-${PV}
40 @@ -39,7 +45,9 @@ PDEPEND="
41 default-compiler-rt? ( sys-libs/compiler-rt )
42 default-libcxx? ( sys-libs/libcxx )"
43
44 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
45 +REQUIRED_USE="${PYTHON_REQUIRED_USE}
46 + || ( ${ALL_LLVM_TARGETS[*]} )
47 + multitarget? ( ${ALL_LLVM_TARGETS[*]} )"
48
49 pkg_pretend() {
50 local build_size=650
51 @@ -114,14 +122,6 @@ src_prepare() {
52 }
53
54 multilib_src_configure() {
55 - local targets
56 - if use multitarget; then
57 - targets=all
58 - else
59 - targets='host;BPF'
60 - use video_cards_radeon && targets+=';AMDGPU'
61 - fi
62 -
63 local libdir=$(get_libdir)
64 local mycmakeargs=(
65 -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
66 @@ -131,7 +131,7 @@ multilib_src_configure() {
67 -DCLANG_GOLD_LIBDIR_SUFFIX="${NATIVE_LIBDIR#lib}"
68
69 -DBUILD_SHARED_LIBS=ON
70 - -DLLVM_TARGETS_TO_BUILD="${targets}"
71 + -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
72 # TODO: get them properly conditional
73 #-DLLVM_BUILD_TESTS=$(usex test)