From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4F5DB138330 for ; Thu, 29 Sep 2016 14:13:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18C9021C093; Thu, 29 Sep 2016 14:13:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F088B21C093 for ; Thu, 29 Sep 2016 14:13:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 25AA5340139 for ; Thu, 29 Sep 2016 14:13:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8D4424A5 for ; Thu, 29 Sep 2016 14:13:22 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1475158392.8b830238ac480ea029c37db2660807255364498b.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/llvm/llvm-3.9.0.ebuild X-VCS-Directories: sys-devel/llvm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8b830238ac480ea029c37db2660807255364498b X-VCS-Branch: master Date: Thu, 29 Sep 2016 14:13:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0329bc0f-5a13-4828-9199-676e9a6db501 X-Archives-Hash: fcf60e74d5226f78429258699491f27c commit: 8b830238ac480ea029c37db2660807255364498b Author: Michał Górny gentoo org> AuthorDate: Sun Sep 25 18:15:35 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Sep 29 14:13:12 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b830238 sys-devel/llvm: Backport LLVM_TARGETS to 3.9.0 sys-devel/llvm/llvm-3.9.0.ebuild | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/sys-devel/llvm/llvm-3.9.0.ebuild b/sys-devel/llvm/llvm-3.9.0.ebuild index c9f2b86..454f997 100644 --- a/sys-devel/llvm/llvm-3.9.0.ebuild +++ b/sys-devel/llvm/llvm-3.9.0.ebuild @@ -21,12 +21,17 @@ SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz lldb? ( http://llvm.org/releases/${PV}/lldb-${PV}.src.tar.xz ) !doc? ( http://dev.gentoo.org/~mgorny/dist/${PN}-3.9.0_rc3-manpages.tar.bz2 )" +# Keep in sync with CMakeLists.txt +ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Mips MSP430 + NVPTX PowerPC Sparc SystemZ X86 XCore ) +ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) + LICENSE="UoI-NCSA" SLOT="0/${PV}" KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="clang debug default-compiler-rt default-libcxx doc gold libedit +libffi lldb multitarget ncurses ocaml python +sanitize +static-analyzer test xml - video_cards_radeon elibc_musl kernel_Darwin kernel_FreeBSD" + elibc_musl kernel_Darwin kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" COMMON_DEPEND=" sys-libs/zlib:0= @@ -78,7 +83,9 @@ PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 ) # pypy gives me around 1700 unresolved tests due to open file limit # being exceeded. probably GC does not close them fast enough. REQUIRED_USE="${PYTHON_REQUIRED_USE} - lldb? ( clang xml )" + lldb? ( clang xml ) + || ( ${ALL_LLVM_TARGETS[*]} ) + multitarget? ( ${ALL_LLVM_TARGETS[*]} )" S=${WORKDIR}/${P/_}.src @@ -233,14 +240,6 @@ src_prepare() { } multilib_src_configure() { - local targets - if use multitarget; then - targets=all - else - targets='host;BPF' - use video_cards_radeon && targets+=';AMDGPU' - fi - local ffi_cflags ffi_ldflags if use libffi; then ffi_cflags=$(pkg-config --cflags-only-I libffi) @@ -252,7 +251,7 @@ multilib_src_configure() { -DLLVM_LIBDIR_SUFFIX=${libdir#lib} -DBUILD_SHARED_LIBS=ON - -DLLVM_TARGETS_TO_BUILD="${targets}" + -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" -DLLVM_BUILD_TESTS=$(usex test) -DLLVM_ENABLE_FFI=$(usex libffi)