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 AF9EF13832E for ; Sun, 14 Aug 2016 05:58:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA07F21C122; Sun, 14 Aug 2016 05:58:47 +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 8CC2C21C122 for ; Sun, 14 Aug 2016 05:58:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 7E33C340C5B for ; Sun, 14 Aug 2016 05:58:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB46C2430 for ; Sun, 14 Aug 2016 05:58:43 +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: <1471154316.4e65f08472f93b9dbccc1b1243b5f38541bdc261.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-9999.ebuild X-VCS-Directories: sys-devel/llvm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 4e65f08472f93b9dbccc1b1243b5f38541bdc261 X-VCS-Branch: master Date: Sun, 14 Aug 2016 05:58:43 +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: c7456a6b-73ef-48a4-948e-e7c8140a9b47 X-Archives-Hash: 309f9d5b2cf6b087a19b8d90670f5d21 commit: 4e65f08472f93b9dbccc1b1243b5f38541bdc261 Author: Lei Zhang gmail com> AuthorDate: Fri Jul 29 08:11:35 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Aug 14 05:58:36 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e65f084 sys-devel/llvm: update the live ebuild Closes: https://github.com/gentoo/gentoo/pull/2066 Package-Manager: portage-2.2.28 sys-devel/llvm/llvm-9999.ebuild | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild index 3420452..c8a34ba 100644 --- a/sys-devel/llvm/llvm-9999.ebuild +++ b/sys-devel/llvm/llvm-9999.ebuild @@ -20,9 +20,9 @@ EGIT_REPO_URI="http://llvm.org/git/llvm.git LICENSE="UoI-NCSA" SLOT="0/${PV%.*}" KEYWORDS="" -IUSE="clang debug +doc gold libedit +libffi lldb multitarget ncurses ocaml - python +static-analyzer test xml video_cards_radeon - kernel_Darwin kernel_FreeBSD" +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" COMMON_DEPEND=" sys-libs/zlib:0= @@ -60,6 +60,7 @@ DEPEND="${COMMON_DEPEND} ${PYTHON_DEPS}" RDEPEND="${COMMON_DEPEND} clang? ( !<=sys-devel/clang-${PV}-r99 ) + default-libcxx? ( sys-libs/libcxx ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )" @@ -174,6 +175,9 @@ src_prepare() { # https://bugs.gentoo.org/show_bug.cgi?id=578392 eapply "${FILESDIR}"/llvm-3.8-soversion.patch + # support building llvm against musl-libc + use elibc_musl && eapply "${FILESDIR}"/llvm-3.8-musl-fixes.patch + # disable use of SDK on OSX, bug #568758 sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die @@ -257,6 +261,14 @@ multilib_src_configure() { # libgomp support fails to find headers without explicit -I # furthermore, it provides only syntax checking -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp + + # override default stdlib and rtlib + -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "") + -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "") + + # compiler-rt's test cases depend on sanitizer + -DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize) + -DCOMPILER_RT_INCLUDE_TESTS=$(usex sanitize) ) fi