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: Thu, 29 Sep 2016 14:13:29
Message-Id: 1475158392.8b830238ac480ea029c37db2660807255364498b.mgorny@gentoo
1 commit: 8b830238ac480ea029c37db2660807255364498b
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 25 18:15:35 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 29 14:13:12 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b830238
7
8 sys-devel/llvm: Backport LLVM_TARGETS to 3.9.0
9
10 sys-devel/llvm/llvm-3.9.0.ebuild | 21 ++++++++++-----------
11 1 file changed, 10 insertions(+), 11 deletions(-)
12
13 diff --git a/sys-devel/llvm/llvm-3.9.0.ebuild b/sys-devel/llvm/llvm-3.9.0.ebuild
14 index c9f2b86..454f997 100644
15 --- a/sys-devel/llvm/llvm-3.9.0.ebuild
16 +++ b/sys-devel/llvm/llvm-3.9.0.ebuild
17 @@ -21,12 +21,17 @@ SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
18 lldb? ( http://llvm.org/releases/${PV}/lldb-${PV}.src.tar.xz )
19 !doc? ( http://dev.gentoo.org/~mgorny/dist/${PN}-3.9.0_rc3-manpages.tar.bz2 )"
20
21 +# Keep in sync with CMakeLists.txt
22 +ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Mips MSP430
23 + NVPTX PowerPC Sparc SystemZ X86 XCore )
24 +ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
25 +
26 LICENSE="UoI-NCSA"
27 SLOT="0/${PV}"
28 KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
29 IUSE="clang debug default-compiler-rt default-libcxx doc gold libedit +libffi
30 lldb multitarget ncurses ocaml python +sanitize +static-analyzer test xml
31 - video_cards_radeon elibc_musl kernel_Darwin kernel_FreeBSD"
32 + elibc_musl kernel_Darwin kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
33
34 COMMON_DEPEND="
35 sys-libs/zlib:0=
36 @@ -78,7 +83,9 @@ PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )
37 # pypy gives me around 1700 unresolved tests due to open file limit
38 # being exceeded. probably GC does not close them fast enough.
39 REQUIRED_USE="${PYTHON_REQUIRED_USE}
40 - lldb? ( clang xml )"
41 + lldb? ( clang xml )
42 + || ( ${ALL_LLVM_TARGETS[*]} )
43 + multitarget? ( ${ALL_LLVM_TARGETS[*]} )"
44
45 S=${WORKDIR}/${P/_}.src
46
47 @@ -233,14 +240,6 @@ src_prepare() {
48 }
49
50 multilib_src_configure() {
51 - local targets
52 - if use multitarget; then
53 - targets=all
54 - else
55 - targets='host;BPF'
56 - use video_cards_radeon && targets+=';AMDGPU'
57 - fi
58 -
59 local ffi_cflags ffi_ldflags
60 if use libffi; then
61 ffi_cflags=$(pkg-config --cflags-only-I libffi)
62 @@ -252,7 +251,7 @@ multilib_src_configure() {
63 -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
64
65 -DBUILD_SHARED_LIBS=ON
66 - -DLLVM_TARGETS_TO_BUILD="${targets}"
67 + -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
68 -DLLVM_BUILD_TESTS=$(usex test)
69
70 -DLLVM_ENABLE_FFI=$(usex libffi)