Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 609654 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/dev-lang/rust/rust-1.15.1.ebuild (-10 / +8 lines)
Lines 6-12 Link Here
6
6
7
PYTHON_COMPAT=( python2_7 )
7
PYTHON_COMPAT=( python2_7 )
8
8
9
inherit python-any-r1 versionator toolchain-funcs
9
inherit python-any-r1 versionator toolchain-funcs rust-toolchain
10
10
11
if [[ ${PV} = *beta* ]]; then
11
if [[ ${PV} = *beta* ]]; then
12
	betaver=${PV//*beta}
12
	betaver=${PV//*beta}
Lines 25-44 Link Here
25
25
26
CARGO_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
26
CARGO_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
27
STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
27
STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
28
RUST_STAGE0_amd64="rustc-${STAGE0_VERSION}-x86_64-unknown-linux-gnu"
28
RUST_STAGE0="rustc-${STAGE0_VERSION}"
29
RUST_STAGE0_x86="rustc-${STAGE0_VERSION}-i686-unknown-linux-gnu"
30
29
31
DESCRIPTION="Systems programming language from Mozilla"
30
DESCRIPTION="Systems programming language from Mozilla"
32
HOMEPAGE="http://www.rust-lang.org/"
31
HOMEPAGE="http://www.rust-lang.org/"
33
32
34
SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
33
SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
35
	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz )
34
	 $(rust_all_arch_uris https://static.rust-lang.org/dist/${RUST_STAGE0})
36
	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz )
37
"
35
"
38
36
39
LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
37
LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
40
38
41
IUSE="clang debug doc libcxx +system-llvm"
39
IUSE="clang debug doc libcxx multilib +system-llvm"
42
REQUIRED_USE="libcxx? ( clang )"
40
REQUIRED_USE="libcxx? ( clang )"
43
41
44
RDEPEND="libcxx? ( sys-libs/libcxx )
42
RDEPEND="libcxx? ( sys-libs/libcxx )
Lines 67-79 Link Here
67
src_configure() {
65
src_configure() {
68
	export CFG_DISABLE_LDCONFIG="notempty"
66
	export CFG_DISABLE_LDCONFIG="notempty"
69
67
70
	local stagename="RUST_STAGE0_${ARCH}"
71
	local stage0="${!stagename}"
72
73
	"${ECONF_SOURCE:-.}"/configure \
68
	"${ECONF_SOURCE:-.}"/configure \
74
		--prefix="${EPREFIX}/usr" \
69
		--prefix="${EPREFIX}/usr" \
75
		--libdir="${EPREFIX}/usr/$(get_libdir)/${P}" \
70
		--libdir="${EPREFIX}/usr/$(get_libdir)/${P}" \
76
		--mandir="${EPREFIX}/usr/share/${P}/man" \
71
		--mandir="${EPREFIX}/usr/share/${P}/man" \
72
		--host=$(rust_abi) \
73
		--build=$(rust_abi) \
74
		--target=$(rust_all_abis) \
77
		--release-channel=${SLOT%%/*} \
75
		--release-channel=${SLOT%%/*} \
78
		--disable-manage-submodules \
76
		--disable-manage-submodules \
79
		--disable-rustbuild \
77
		--disable-rustbuild \
Lines 82-88 Link Here
82
		--python=${EPYTHON} \
80
		--python=${EPYTHON} \
83
		--disable-rpath \
81
		--disable-rpath \
84
		--enable-local-rust \
82
		--enable-local-rust \
85
		--local-rust-root="${WORKDIR}/${stage0}/rustc" \
83
		--local-rust-root="${WORKDIR}/${RUST_STAGE0}-$(rust_abi)/rustc" \
86
		$(use_enable clang) \
84
		$(use_enable clang) \
87
		$(use_enable debug) \
85
		$(use_enable debug) \
88
		$(use_enable debug llvm-assertions) \
86
		$(use_enable debug llvm-assertions) \

Return to bug 609654