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-util/cargo/cargo-0.30.0.ebuild (-30 / +3 lines)
Lines 139-145 Link Here
139
wincolor-1.0.1
139
wincolor-1.0.1
140
"
140
"
141
141
142
inherit cargo bash-completion-r1 multiprocessing versionator
142
inherit cargo bash-completion-r1 multiprocessing versionator rust-toolchain
143
143
144
BOOTSTRAP_VERSION="0.$(($(get_version_component_range 2) - 1)).0"
144
BOOTSTRAP_VERSION="0.$(($(get_version_component_range 2) - 1)).0"
145
145
Lines 147-166 Link Here
147
HOMEPAGE="http://crates.io"
147
HOMEPAGE="http://crates.io"
148
SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz
148
SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz
149
	$(cargo_crate_uris ${CRATES})
149
	$(cargo_crate_uris ${CRATES})
150
	x86?   (
150
	$(rust_all_arch_uris cargo-${BOOTSTRAP_VERSION})"
151
		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-i686-unknown-linux-gnu.tar.xz
152
	)
153
	amd64? (
154
		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.xz
155
	)
156
	arm? (
157
		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabi.tar.xz
158
		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabihf.tar.xz
159
		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-armv7-unknown-linux-gnueabihf.tar.xz
160
	)
161
	arm64? (
162
		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-aarch64-unknown-linux-gnu.tar.xz
163
	)"
164
151
165
RESTRICT="mirror"
152
RESTRICT="mirror"
166
LICENSE="|| ( MIT Apache-2.0 )"
153
LICENSE="|| ( MIT Apache-2.0 )"
Lines 169-188 Link Here
169
156
170
IUSE="doc libressl"
157
IUSE="doc libressl"
171
158
172
if [[ ${ARCH} = "amd64" ]]; then
173
	TRIPLE="x86_64-unknown-linux-gnu"
174
elif [[ ${ARCH} = "x86" ]]; then
175
	TRIPLE="i686-unknown-linux-gnu"
176
elif [[ ${ARCH} = "arm64" ]]; then
177
	TRIPLE="aarch64-unknown-linux-gnu"
178
elif [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
179
	TRIPLE="arm-unknown-linux-gnueabi"
180
elif [[ ${CHOST} == armv6*h* ]]; then
181
	TRIPLE="arm-unknown-linux-gnueabihf"
182
elif [[ ${CHOST} == armv7*h* ]]; then
183
	TRIPLE="armv7-unknown-linux-gnueabihf"
184
fi
185
186
COMMON_DEPEND="sys-libs/zlib
159
COMMON_DEPEND="sys-libs/zlib
187
	!libressl? ( dev-libs/openssl:0= )
160
	!libressl? ( dev-libs/openssl:0= )
188
	libressl? ( dev-libs/libressl:0= )
161
	libressl? ( dev-libs/libressl:0= )
Lines 208-214 Link Here
208
181
209
src_compile() {
182
src_compile() {
210
	export CARGO_HOME="${ECARGO_HOME}"
183
	export CARGO_HOME="${ECARGO_HOME}"
211
	local cargo="${WORKDIR}/cargo-${BOOTSTRAP_VERSION}-${TRIPLE}/cargo/bin/cargo"
184
	local cargo="${WORKDIR}/cargo-${BOOTSTRAP_VERSION}-$(rust_abi)/cargo/bin/cargo"
212
	${cargo} build -j$(makeopts_jobs) --release || die
185
	${cargo} build -j$(makeopts_jobs) --release || die
213
186
214
	# Building HTML documentation
187
	# Building HTML documentation

Return to bug 609654