diff options
author | Jauhien Piatlicki <jauhien@gentoo.org> | 2014-11-21 10:39:12 +0000 |
---|---|---|
committer | Jauhien Piatlicki <jauhien@gentoo.org> | 2014-11-21 10:39:12 +0000 |
commit | 531765953892b2528b18d591ab43c3fbdebc002f (patch) | |
tree | 5fd72f5173b1a6e1d2f7f264f8660c479430529f /dev-lang/rust/rust-999-r1.ebuild | |
parent | Initial import (bug #432688). (diff) | |
download | historical-531765953892b2528b18d591ab43c3fbdebc002f.tar.gz historical-531765953892b2528b18d591ab43c3fbdebc002f.tar.bz2 historical-531765953892b2528b18d591ab43c3fbdebc002f.zip |
add system-llvm USE and make it default; remove rust-0.12.0-libdir.patch from nightly, as it was merged into upstream
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB2EFA1D4
Diffstat (limited to 'dev-lang/rust/rust-999-r1.ebuild')
-rw-r--r-- | dev-lang/rust/rust-999-r1.ebuild | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/dev-lang/rust/rust-999-r1.ebuild b/dev-lang/rust/rust-999-r1.ebuild index 27f7da3e1ea1..9def1dff2fda 100644 --- a/dev-lang/rust/rust-999-r1.ebuild +++ b/dev-lang/rust/rust-999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-999-r1.ebuild,v 1.1 2014/10/18 12:48:43 jauhien Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-999-r1.ebuild,v 1.2 2014/11/21 10:39:00 jauhien Exp $ EAPI="5" @@ -18,7 +18,7 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" SLOT="nightly" KEYWORDS="" -IUSE="clang debug emacs libcxx vim-syntax zsh-completion" +IUSE="clang debug emacs libcxx +system-llvm vim-syntax zsh-completion" REQUIRED_USE="libcxx? ( clang )" CDEPEND="libcxx? ( sys-libs/libcxx ) @@ -30,6 +30,7 @@ DEPEND="${CDEPEND} >=dev-lang/perl-5.0 net-misc/wget clang? ( sys-devel/clang ) + system-llvm? ( >=sys-devel/llvm-3.5.0[multitarget(-)] ) " RDEPEND="${CDEPEND} emacs? ( >=app-emacs/rust-mode-${PV} ) @@ -60,6 +61,9 @@ src_prepare() { } src_configure() { + local system_llvm + use system-llvm && system_llvm="--llvm-root=${EPREFIX}/usr" + "${ECONF_SOURCE:-.}"/configure \ --prefix="${EPREFIX}/usr" \ --libdir="${EPREFIX}/usr/lib/${P}" \ @@ -72,6 +76,7 @@ src_configure() { $(use_enable !debug optimize-llvm) \ $(use_enable !debug optimize-tests) \ $(use_enable libcxx libcpp) \ + ${system_llvm} \ --disable-manage-submodules \ --disable-verify-install \ --disable-docs \ |