jauhien 14/11/21 10:39:00
Modified: metadata.xml rust-999-r1.ebuild rust-9999-r3.ebuild
ChangeLog
Log:
add system-llvm USE and make it default; remove rust-0.12.0-libdir.patch from
nightly, as it was merged into upstream
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
0xB2EFA1D4)
Revision Changes Path
1.4 dev-lang/rust/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/metadata.xml?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/metadata.xml?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/metadata.xml?r1=1.3&r2=1.4
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/rust/metadata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- metadata.xml 29 Aug 2014 14:12:27 -0000 1.3
+++ metadata.xml 21 Nov 2014 10:39:00 -0000 1.4
@@ -12,5 +12,7 @@
<flag name="clang">Use <pkg>sys-devel/clang</pkg> for building</flag>
<flag name="libcxx">Use <pkg>sys-libs/libcxx</pkg> as standard
library when building with <pkg>sys-devel/clang</pkg></flag>
+ <flag name="system-llvm">Use system <pkg>sys-devel/llvm</pkg> in
+ place of the bundled one</flag>
</use>
</pkgmetadata>
1.2 dev-lang/rust/rust-999-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/rust-999-r1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/rust-999-r1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/rust-999-r1.ebuild?r1=1.1&r2=1.2
Index: rust-999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-999-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rust-999-r1.ebuild 18 Oct 2014 12:48:43 -0000 1.1
+++ rust-999-r1.ebuild 21 Nov 2014 10:39:00 -0000 1.2
@@ -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 @@
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 @@
>=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_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 @@
$(use_enable !debug optimize-llvm) \
$(use_enable !debug optimize-tests) \
$(use_enable libcxx libcpp) \
+ ${system_llvm} \
--disable-manage-submodules \
--disable-verify-install \
--disable-docs \
1.2 dev-lang/rust/rust-9999-r3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/rust-9999-r3.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/rust-9999-r3.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/rust-9999-r3.ebuild?r1=1.1&r2=1.2
Index: rust-9999-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-9999-r3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rust-9999-r3.ebuild 18 Oct 2014 12:48:43 -0000 1.1
+++ rust-9999-r3.ebuild 21 Nov 2014 10:39:00 -0000 1.2
@@ -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-9999-r3.ebuild,v 1.1
2014/10/18 12:48:43 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-9999-r3.ebuild,v 1.2
2014/11/21 10:39:00 jauhien Exp $
EAPI="5"
@@ -16,7 +16,7 @@
SLOT="git"
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 )
@@ -27,6 +27,7 @@
${PYTHON_DEPS}
>=dev-lang/perl-5.0
clang? ( sys-devel/clang )
+ system-llvm? ( >=sys-devel/llvm-3.5.0[multitarget(-)] )
"
RDEPEND="${CDEPEND}
emacs? ( >=app-emacs/rust-mode-${PV} )
@@ -47,13 +48,16 @@
}
src_prepare() {
- epatch "${FILESDIR}/${PN}-0.12.0-no-ldconfig.patch"
"${FILESDIR}/${PN}-0.12.0-libdir.patch"
+ epatch "${FILESDIR}/${PN}-0.12.0-no-ldconfig.patch"
local postfix="gentoo-${SLOT}"
sed -i -e "s/CFG_FILENAME_EXTRA=.*/CFG_FILENAME_EXTRA=${postfix}/"
mk/main.mk || die
}
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}" \
@@ -66,6 +70,7 @@
$(use_enable !debug optimize-llvm) \
$(use_enable !debug optimize-tests) \
$(use_enable libcxx libcpp) \
+ ${system_llvm} \
--disable-manage-submodules \
--disable-verify-install \
--disable-docs \
1.6 dev-lang/rust/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/ChangeLog?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/ChangeLog?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/ChangeLog?r1=1.5&r2=1.6
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/rust/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog 18 Oct 2014 12:48:43 -0000 1.5
+++ ChangeLog 21 Nov 2014 10:39:00 -0000 1.6
@@ -1,6 +1,11 @@
# ChangeLog for dev-lang/rust
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/ChangeLog,v 1.5 2014/10/18
12:48:43 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/ChangeLog,v 1.6 2014/11/21
10:39:00 jauhien Exp $
+
+ 21 Nov 2014; Jauhien Piatlicki <[email protected]> metadata.xml,
+ rust-999-r1.ebuild, rust-9999-r3.ebuild:
+ add system-llvm USE and make it default; remove rust-0.12.0-libdir.patch from
+ nightly, as it was merged into upstream
*rust-0.12.0 (18 Oct 2014)
*rust-999-r1 (18 Oct 2014)
