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

Collapse All | Expand All

(-)a/dev-lang/rust/rust-1.44.1.ebuild (-4 / +18 lines)
Lines 18-24 else Link Here
18
	SLOT="stable/${ABI_VER}"
18
	SLOT="stable/${ABI_VER}"
19
	MY_P="rustc-${PV}"
19
	MY_P="rustc-${PV}"
20
	SRC="${MY_P}-src.tar.xz"
20
	SRC="${MY_P}-src.tar.xz"
21
	KEYWORDS="amd64 arm arm64 ppc64 x86"
21
	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
22
fi
22
fi
23
23
24
RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).1"
24
RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).1"
Lines 211-216 src_configure() { Link Here
211
	fi
211
	fi
212
212
213
	rust_target="$(rust_abi)"
213
	rust_target="$(rust_abi)"
214
	llvm_libunwind="false"
215
	if tc-is-clang; then
216
		local compiler_rt=$($(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -print-libgcc-file-name)
217
		if [[ ${compiler_rt} == *libclang_rt* ]]; then
218
			if has_version sys-libs/llvm-libunwind; then
219
				einfo "Linking with llvm-libunwind"
220
				llvm_libunwind=true
221
			else
222
				einfo "Linking with gcc_s unwinder"
223
				llvm_libunwind=false
224
			fi
225
		fi
226
	fi
214
227
215
	cat <<- EOF > "${S}"/config.toml
228
	cat <<- EOF > "${S}"/config.toml
216
		[llvm]
229
		[llvm]
Lines 262-267 src_configure() { Link Here
262
		lld = $(usex system-llvm false $(toml_usex wasm))
275
		lld = $(usex system-llvm false $(toml_usex wasm))
263
		backtrace-on-ice = true
276
		backtrace-on-ice = true
264
		jemalloc = false
277
		jemalloc = false
278
		llvm-libunwind = ${llvm_libunwind}
265
		[dist]
279
		[dist]
266
		src-tarball = false
280
		src-tarball = false
267
	EOF
281
	EOF
Lines 441-449 src_install() { Link Here
441
	fi
455
	fi
442
456
443
	dodoc COPYRIGHT
457
	dodoc COPYRIGHT
444
	rm "${ED}/usr/share/doc/${P}"/*.old || die
458
	rm -f "${ED}/usr/share/doc/${P}"/*.old || die
445
	rm "${ED}/usr/share/doc/${P}/LICENSE-APACHE" || die
459
	rm -f "${ED}/usr/share/doc/${P}/LICENSE-APACHE" || die
446
	rm "${ED}/usr/share/doc/${P}/LICENSE-MIT" || die
460
	rm -f "${ED}/usr/share/doc/${P}/LICENSE-MIT" || die
447
461
448
	# note: eselect-rust adds EROOT to all paths below
462
	# note: eselect-rust adds EROOT to all paths below
449
	cat <<-EOF > "${T}/provider-${P}"
463
	cat <<-EOF > "${T}/provider-${P}"

Return to bug 733242