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.29.2.ebuild (-12 / +2 lines)
Lines 21-34 Link Here
21
	KEYWORDS="~amd64 ~arm64 ~x86"
21
	KEYWORDS="~amd64 ~arm64 ~x86"
22
fi
22
fi
23
23
24
CHOST_amd64=x86_64-unknown-linux-gnu
25
CHOST_x86=i686-unknown-linux-gnu
26
CHOST_arm64=aarch64-unknown-linux-gnu
27
28
RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
24
RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
29
RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
30
RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
31
RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
32
25
33
CARGO_DEPEND_VERSION="0.$(($(ver_cut 2) + 1)).0"
26
CARGO_DEPEND_VERSION="0.$(($(ver_cut 2) + 1)).0"
34
27
Lines 83-90 Link Here
83
src_prepare() {
76
src_prepare() {
84
	local rust_stage0_root="${WORKDIR}"/rust-stage0
77
	local rust_stage0_root="${WORKDIR}"/rust-stage0
85
78
86
	local rust_stage0_name="RUST_STAGE0_${ARCH}"
79
	local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)"
87
	local rust_stage0="${!rust_stage0_name}"
88
80
89
	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
81
	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
90
82
Lines 96-103 Link Here
96
88
97
	# Collect rust target names to compile standard libs for all ABIs.
89
	# Collect rust target names to compile standard libs for all ABIs.
98
	for v in $(multilib_get_enabled_abi_pairs); do
90
	for v in $(multilib_get_enabled_abi_pairs); do
99
		rust_target_name="CHOST_${v##*.}"
91
		rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
100
		rust_targets="${rust_targets},\"${!rust_target_name}\""
101
	done
92
	done
102
	if use wasm; then
93
	if use wasm; then
103
		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
94
		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
Lines 124-130 Link Here
124
115
125
	local rust_stage0_root="${WORKDIR}"/rust-stage0
116
	local rust_stage0_root="${WORKDIR}"/rust-stage0
126
117
127
	rust_target_name="CHOST_${ARCH}"
128
	rust_target="$(rust_abi)"
118
	rust_target="$(rust_abi)"
129
119
130
	cat <<- EOF > "${S}"/config.toml
120
	cat <<- EOF > "${S}"/config.toml

Return to bug 609654