forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev-lang/rust: revbump 1.40.0 with fixes
add parallel-compiler useflag, to use pass RUSTFLAGS=" -Zthreads=<num>" add debian soname patch add system-bootstrap install rustlib into /usr/lib unconditionally drop multilib hacks various minor fixes add myself to metadata.xml explicitly Bug: https://bugs.gentoo.org/694248 Bug: https://bugs.gentoo.org/703744 Bug: https://bugs.gentoo.org/703470 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev <[email protected]>
- Loading branch information
Showing
3 changed files
with
382 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
Description: Set DT_SONAME when building dylibs | ||
In Rust, library filenames include a version-specific hash to help | ||
the run-time linker find the correct version. Unlike in C/C++, the | ||
compiler looks for all libraries matching a glob that ignores the | ||
hash and reads embedded metadata to work out versions, etc. | ||
. | ||
The upshot is that there is no need for the usual "libfoo.so -> | ||
libfoo-1.2.3.so" symlink common with C/C++ when building with Rust, | ||
and no need to communicate an alternate filename to use at run-time | ||
vs compile time. If linking to a Rust dylib from C/C++ however, a | ||
"libfoo.so -> libfoo-$hash.so" symlink may well be useful and in | ||
this case DT_SONAME=libfoo-$hash.so would be required. More | ||
mundanely, various tools (eg: dpkg-shlibdeps) complain if they don't | ||
find DT_SONAME on shared libraries in public directories. | ||
. | ||
This patch passes -Wl,-soname=$outfile when building dylibs (and | ||
using a GNU linker). | ||
Author: Angus Lees <[email protected]> | ||
Forwarded: no | ||
|
||
--- a/src/librustc_codegen_ssa/back/link.rs | ||
+++ b/src/librustc_codegen_ssa/back/link.rs | ||
@@ -1034,6 +1034,13 @@ | ||
cmd.args(&rpath::get_rpath_flags(&mut rpath_config)); | ||
} | ||
|
||
+ if (crate_type == config::CrateType::Dylib || crate_type == config::CrateType::Cdylib) | ||
+ && t.options.linker_is_gnu { | ||
+ let filename = String::from(out_filename.file_name().unwrap().to_str().unwrap()); | ||
+ let soname = [String::from("-Wl,-soname=") + &filename]; | ||
+ cmd.args(&soname); | ||
+ } | ||
+ | ||
// Finally add all the linker arguments provided on the command line along | ||
// with any #[link_args] attributes found inside the crate | ||
if let Some(ref args) = sess.opts.cg.link_args { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,10 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> | ||
<pkgmetadata> | ||
<maintainer type="person"> | ||
<email>[email protected]</email> | ||
<name>Georgy Yakovlev</name> | ||
</maintainer> | ||
<maintainer type="project"> | ||
<email>[email protected]</email> | ||
<name>Rust Project</name> | ||
|
@@ -9,8 +13,10 @@ | |
<flag name="clippy">Install clippy component</flag> | ||
<flag name="system-llvm">Use the system LLVM install</flag> | ||
<flag name="nightly">Enable nightly (UNSTABLE) features</flag> | ||
<flag name="parallel-compiler">Build a multi-threaded rustc</flag> | ||
<flag name="rls">Install rls component</flag> | ||
<flag name="rustfmt">Install rustfmt component</flag> | ||
<flag name="system-bootstrap">Bootstrap using installed rust compiler</flag> | ||
<flag name="wasm">Build support for the wasm32-unknown-unknown | ||
target</flag> | ||
</use> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,340 @@ | ||
# Copyright 1999-2019 Gentoo Authors | ||
# Distributed under the terms of the GNU General Public License v2 | ||
|
||
EAPI=7 | ||
|
||
PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) | ||
|
||
inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs | ||
|
||
if [[ ${PV} = *beta* ]]; then | ||
betaver=${PV//*beta} | ||
BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}" | ||
MY_P="rustc-beta" | ||
SLOT="beta/${PV}" | ||
SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz" | ||
else | ||
ABI_VER="$(ver_cut 1-2)" | ||
SLOT="stable/${ABI_VER}" | ||
MY_P="rustc-${PV}" | ||
SRC="${MY_P}-src.tar.xz" | ||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" | ||
fi | ||
|
||
RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0" | ||
|
||
DESCRIPTION="Systems programming language from Mozilla" | ||
HOMEPAGE="https://www.rust-lang.org/" | ||
|
||
SRC_URI=" | ||
https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz | ||
!system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) ) | ||
" | ||
|
||
ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 | ||
NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore ) | ||
ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) | ||
LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} | ||
|
||
LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" | ||
|
||
IUSE="clippy cpu_flags_x86_sse2 debug doc libressl nightly parallel-compiler rls rustfmt system-bootstrap system-llvm wasm ${ALL_LLVM_TARGETS[*]}" | ||
|
||
# Please keep the LLVM dependency block separate. Since LLVM is slotted, | ||
# we need to *really* make sure we're not pulling more than one slot | ||
# simultaneously. | ||
|
||
# How to use it: | ||
# 1. List all the working slots (with min versions) in ||, newest first. | ||
# 2. Update the := to specify *max* version, e.g. < 10. | ||
# 3. Specify LLVM_MAX_SLOT, e.g. 9. | ||
LLVM_DEPEND=" | ||
|| ( | ||
sys-devel/llvm:9[llvm_targets_WebAssembly?] | ||
wasm? ( =sys-devel/lld-9* ) | ||
) | ||
<sys-devel/llvm-10:= | ||
" | ||
LLVM_MAX_SLOT=9 | ||
|
||
# FIXME: | ||
# this should be '>=virtual/rust-1.$(($(ver_cut 2) - 1))', but we can't do it yet | ||
# as the first gentoo-built rust that can bootstap new compiler is 1.40.0-r1 | ||
BOOTSTRAP_DEPEND="|| ( =dev-lang/rust-${PF} =dev-lang/rust-bin-${PV}* )" | ||
|
||
COMMON_DEPEND=" | ||
sys-libs/zlib | ||
!libressl? ( dev-libs/openssl:0= ) | ||
libressl? ( dev-libs/libressl:0= ) | ||
net-libs/libssh2 | ||
net-libs/http-parser:= | ||
net-misc/curl[ssl] | ||
system-llvm? ( | ||
${LLVM_DEPEND} | ||
dev-util/cmake | ||
dev-util/ninja | ||
) | ||
" | ||
|
||
DEPEND="${COMMON_DEPEND} | ||
${PYTHON_DEPS} | ||
|| ( | ||
>=sys-devel/gcc-4.7 | ||
>=sys-devel/clang-3.5 | ||
) | ||
system-bootstrap? ( ${BOOTSTRAP_DEPEND} ) | ||
" | ||
|
||
RDEPEND="${COMMON_DEPEND} | ||
>=app-eselect/eselect-rust-20190311 | ||
" | ||
|
||
REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} ) | ||
parallel-compiler? ( nightly ) | ||
wasm? ( llvm_targets_WebAssembly ) | ||
x86? ( cpu_flags_x86_sse2 ) | ||
" | ||
|
||
QA_FLAGS_IGNORED=" | ||
usr/bin/*-${PV} | ||
usr/lib*/lib*.so | ||
usr/lib/rurstlib/*/codegen-backends/librustc_codegen_llvm-llvm.so | ||
usr/lib/rustlib/*/lib/lib*.so | ||
" | ||
|
||
QA_SONAME="usr/lib*/librustc_macros*.so" | ||
|
||
PATCHES=( | ||
"${FILESDIR}"/1.36.0-libressl.patch | ||
"${FILESDIR}"/1.40.0-add-soname.patch | ||
) | ||
|
||
S="${WORKDIR}/${MY_P}-src" | ||
|
||
toml_usex() { | ||
usex "$1" true false | ||
} | ||
|
||
pre_build_checks() { | ||
CHECKREQS_DISK_BUILD="9G" | ||
eshopts_push -s extglob | ||
if is-flagq '-g?(gdb)?([1-9])'; then | ||
CHECKREQS_DISK_BUILD="14G" | ||
fi | ||
eshopts_pop | ||
check-reqs_pkg_setup | ||
} | ||
|
||
pkg_pretend() { | ||
pre_build_checks | ||
} | ||
|
||
pkg_setup() { | ||
pre_build_checks | ||
python-any-r1_pkg_setup | ||
use system-llvm && llvm_pkg_setup | ||
} | ||
|
||
src_prepare() { | ||
if ! use system-bootstrap; then | ||
local rust_stage0_root="${WORKDIR}"/rust-stage0 | ||
local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)" | ||
|
||
"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \ | ||
--destdir="${rust_stage0_root}" --prefix=/ || die | ||
fi | ||
|
||
default | ||
} | ||
|
||
src_configure() { | ||
local rust_target="" rust_targets="" arch_cflags | ||
|
||
# Collect rust target names to compile standard libs for all ABIs. | ||
for v in $(multilib_get_enabled_abi_pairs); do | ||
rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\"" | ||
done | ||
if use wasm; then | ||
rust_targets="${rust_targets},\"wasm32-unknown-unknown\"" | ||
fi | ||
rust_targets="${rust_targets#,}" | ||
|
||
local extended="true" tools="\"cargo\"," | ||
if use clippy; then | ||
tools="\"clippy\",$tools" | ||
fi | ||
if use rls; then | ||
tools="\"rls\",\"analysis\",\"src\",$tools" | ||
fi | ||
if use rustfmt; then | ||
tools="\"rustfmt\",$tools" | ||
fi | ||
|
||
local rust_stage0_root | ||
if use system-bootstrap; then | ||
rust_stage0_root="$(rustc --print sysroot)" | ||
else | ||
rust_stage0_root="${WORKDIR}"/rust-stage0 | ||
fi | ||
|
||
rust_target="$(rust_abi)" | ||
|
||
cat <<- EOF > "${S}"/config.toml | ||
[llvm] | ||
optimize = $(toml_usex !debug) | ||
release-debuginfo = $(toml_usex debug) | ||
assertions = $(toml_usex debug) | ||
targets = "${LLVM_TARGETS// /;}" | ||
experimental-targets = "" | ||
link-shared = $(toml_usex system-llvm) | ||
[build] | ||
build = "${rust_target}" | ||
host = ["${rust_target}"] | ||
target = [${rust_targets}] | ||
cargo = "${rust_stage0_root}/bin/cargo" | ||
rustc = "${rust_stage0_root}/bin/rustc" | ||
docs = $(toml_usex doc) | ||
compiler-docs = $(toml_usex doc) | ||
submodules = false | ||
python = "${EPYTHON}" | ||
locked-deps = true | ||
vendor = true | ||
extended = ${extended} | ||
tools = [${tools}] | ||
verbose = 2 | ||
[install] | ||
prefix = "${EPREFIX}/usr" | ||
libdir = "lib" | ||
docdir = "share/doc/${PF}" | ||
mandir = "share/man" | ||
[rust] | ||
optimize = $(toml_usex !debug) | ||
debug = $(toml_usex debug) | ||
debug-assertions = $(toml_usex debug) | ||
default-linker = "$(tc-getCC)" | ||
parallel-compiler = $(toml_usex parallel-compiler) | ||
channel = "$(usex nightly nightly stable)" | ||
rpath = false | ||
lld = $(usex system-llvm false $(toml_usex wasm)) | ||
[dist] | ||
src-tarball = false | ||
EOF | ||
|
||
for v in $(multilib_get_enabled_abi_pairs); do | ||
rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) | ||
arch_cflags="$(get_abi_CFLAGS ${v##*.})" | ||
|
||
cat <<- EOF >> "${S}"/config.env | ||
CFLAGS_${rust_target}=${arch_cflags} | ||
EOF | ||
|
||
cat <<- EOF >> "${S}"/config.toml | ||
[target.${rust_target}] | ||
cc = "$(tc-getBUILD_CC)" | ||
cxx = "$(tc-getBUILD_CXX)" | ||
linker = "$(tc-getCC)" | ||
ar = "$(tc-getAR)" | ||
EOF | ||
if use system-llvm; then | ||
cat <<- EOF >> "${S}"/config.toml | ||
llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" | ||
EOF | ||
fi | ||
done | ||
|
||
if use wasm; then | ||
cat <<- EOF >> "${S}"/config.toml | ||
[target.wasm32-unknown-unknown] | ||
linker = "$(usex system-llvm lld rust-lld)" | ||
EOF | ||
fi | ||
} | ||
|
||
src_compile() { | ||
env $(cat "${S}"/config.env)\ | ||
"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \ | ||
--exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305 | ||
} | ||
|
||
src_install() { | ||
env DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml \ | ||
--exclude src/tools/miri || die | ||
|
||
# bug #689562, #689160 | ||
rm "${D}/etc/bash_completion.d/cargo" || die | ||
rmdir "${D}"/etc{/bash_completion.d,} || die | ||
dobashcomp build/tmp/dist/cargo-image/etc/bash_completion.d/cargo | ||
|
||
mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die | ||
mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die | ||
mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die | ||
mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die | ||
mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die | ||
mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die | ||
if use clippy; then | ||
mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die | ||
mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die | ||
fi | ||
if use rls; then | ||
mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die | ||
fi | ||
if use rustfmt; then | ||
mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die | ||
mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die | ||
fi | ||
|
||
# Move public shared libs to abi specific libdir | ||
# Private and target specific libs MUST stay in /usr/lib/rustlib/${rust_target}/lib | ||
if [[ $(get_libdir) != lib ]]; then | ||
dodir /usr/$(get_libdir) | ||
mv "${ED}/usr/lib"/*.so "${ED}/usr/$(get_libdir)/" || die | ||
fi | ||
|
||
dodoc COPYRIGHT | ||
|
||
# note: eselect-rust adds EROOT to all paths below | ||
cat <<-EOF > "${T}/provider-${P}" | ||
/usr/bin/rustdoc | ||
/usr/bin/rust-gdb | ||
/usr/bin/rust-gdbgui | ||
/usr/bin/rust-lldb | ||
EOF | ||
echo /usr/bin/cargo >> "${T}/provider-${P}" | ||
if use clippy; then | ||
echo /usr/bin/clippy-driver >> "${T}/provider-${P}" | ||
echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" | ||
fi | ||
if use rls; then | ||
echo /usr/bin/rls >> "${T}/provider-${P}" | ||
fi | ||
if use rustfmt; then | ||
echo /usr/bin/rustfmt >> "${T}/provider-${P}" | ||
echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" | ||
fi | ||
dodir /etc/env.d/rust | ||
insinto /etc/env.d/rust | ||
doins "${T}/provider-${P}" | ||
} | ||
|
||
pkg_postinst() { | ||
eselect rust update --if-unset | ||
|
||
elog "Rust installs a helper script for calling GDB and LLDB," | ||
elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}." | ||
|
||
ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo." | ||
ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some" | ||
ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'." | ||
|
||
if has_version app-editors/emacs; then | ||
elog "install app-emacs/rust-mode to get emacs support for rust." | ||
fi | ||
|
||
if has_version app-editors/gvim || has_version app-editors/vim; then | ||
elog "install app-vim/rust-vim to get vim support for rust." | ||
fi | ||
} | ||
|
||
pkg_postrm() { | ||
eselect rust cleanup | ||
} |