mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-22 22:21:10 +02:00
dev-lang/rust: Sync with Gentoo
It's from Gentoo commit 3ab7539f2f0bf97b90c22d860a91bcbe321f4a0e.
This commit is contained in:
parent
51e07eb527
commit
4c8a510b59
@ -68,7 +68,7 @@ BDEPEND="${PYTHON_DEPS}
|
|||||||
>=sys-devel/gcc-4.7[cxx]
|
>=sys-devel/gcc-4.7[cxx]
|
||||||
>=llvm-core/clang-3.5
|
>=llvm-core/clang-3.5
|
||||||
)
|
)
|
||||||
lto? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )
|
lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) )
|
||||||
!system-llvm? (
|
!system-llvm? (
|
||||||
>=dev-build/cmake-3.13.4
|
>=dev-build/cmake-3.13.4
|
||||||
app-alternatives/ninja
|
app-alternatives/ninja
|
||||||
|
@ -68,7 +68,7 @@ BDEPEND="${PYTHON_DEPS}
|
|||||||
>=sys-devel/gcc-4.7[cxx]
|
>=sys-devel/gcc-4.7[cxx]
|
||||||
>=llvm-core/clang-3.5
|
>=llvm-core/clang-3.5
|
||||||
)
|
)
|
||||||
lto? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )
|
lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) )
|
||||||
!system-llvm? (
|
!system-llvm? (
|
||||||
>=dev-build/cmake-3.13.4
|
>=dev-build/cmake-3.13.4
|
||||||
app-alternatives/ninja
|
app-alternatives/ninja
|
||||||
|
@ -94,7 +94,7 @@ BDEPEND="${PYTHON_DEPS}
|
|||||||
>=sys-devel/gcc-4.7[cxx]
|
>=sys-devel/gcc-4.7[cxx]
|
||||||
>=llvm-core/clang-3.5
|
>=llvm-core/clang-3.5
|
||||||
)
|
)
|
||||||
lto? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )
|
lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) )
|
||||||
!system-llvm? (
|
!system-llvm? (
|
||||||
>=dev-build/cmake-3.13.4
|
>=dev-build/cmake-3.13.4
|
||||||
app-alternatives/ninja
|
app-alternatives/ninja
|
||||||
|
@ -94,7 +94,7 @@ BDEPEND="${PYTHON_DEPS}
|
|||||||
>=sys-devel/gcc-4.7[cxx]
|
>=sys-devel/gcc-4.7[cxx]
|
||||||
>=llvm-core/clang-3.5
|
>=llvm-core/clang-3.5
|
||||||
)
|
)
|
||||||
lto? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )
|
lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) )
|
||||||
!system-llvm? (
|
!system-llvm? (
|
||||||
>=dev-build/cmake-3.13.4
|
>=dev-build/cmake-3.13.4
|
||||||
app-alternatives/ninja
|
app-alternatives/ninja
|
||||||
|
@ -94,7 +94,7 @@ BDEPEND="${PYTHON_DEPS}
|
|||||||
>=sys-devel/gcc-4.7[cxx]
|
>=sys-devel/gcc-4.7[cxx]
|
||||||
>=llvm-core/clang-3.5
|
>=llvm-core/clang-3.5
|
||||||
)
|
)
|
||||||
lto? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )
|
lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) )
|
||||||
!system-llvm? (
|
!system-llvm? (
|
||||||
>=dev-build/cmake-3.13.4
|
>=dev-build/cmake-3.13.4
|
||||||
app-alternatives/ninja
|
app-alternatives/ninja
|
||||||
|
@ -68,7 +68,7 @@ for _x in "${_ALL_RUST_EXPERIMENTAL_TARGETS[@]}"; do
|
|||||||
done
|
done
|
||||||
|
|
||||||
LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
|
LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
|
||||||
SLOT="$(ver_cut 1-2)"
|
SLOT="${PV%%_*}" # Beta releases get to share the same SLOT as the eventual stable
|
||||||
|
|
||||||
IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto rustfmt rust-analyzer rust-src +system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
|
IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto rustfmt rust-analyzer rust-src +system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
|
||||||
|
|
||||||
@ -94,7 +94,7 @@ BDEPEND="${PYTHON_DEPS}
|
|||||||
>=sys-devel/gcc-4.7[cxx]
|
>=sys-devel/gcc-4.7[cxx]
|
||||||
>=llvm-core/clang-3.5
|
>=llvm-core/clang-3.5
|
||||||
)
|
)
|
||||||
lto? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )
|
lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) )
|
||||||
!system-llvm? (
|
!system-llvm? (
|
||||||
>=dev-build/cmake-3.13.4
|
>=dev-build/cmake-3.13.4
|
||||||
app-alternatives/ninja
|
app-alternatives/ninja
|
||||||
@ -719,7 +719,7 @@ src_install() {
|
|||||||
# we need realpath on /usr/bin/* symlink return version-appended binary path.
|
# we need realpath on /usr/bin/* symlink return version-appended binary path.
|
||||||
# so /usr/bin/rustc should point to /usr/lib/rust/<ver>/bin/rustc-<ver>
|
# so /usr/bin/rustc should point to /usr/lib/rust/<ver>/bin/rustc-<ver>
|
||||||
# need to fix eselect-rust to remove this hack.
|
# need to fix eselect-rust to remove this hack.
|
||||||
local ver_i="${i}-${SLOT}"
|
local ver_i="${i}-${PV%%_*}"
|
||||||
if [[ -f "${ED}/usr/lib/${PN}/${SLOT}/bin/${i}" ]]; then
|
if [[ -f "${ED}/usr/lib/${PN}/${SLOT}/bin/${i}" ]]; then
|
||||||
einfo "Installing ${i} symlink"
|
einfo "Installing ${i} symlink"
|
||||||
ln -v "${ED}/usr/lib/${PN}/${SLOT}/bin/${i}" "${ED}/usr/lib/${PN}/${SLOT}/bin/${ver_i}" || die
|
ln -v "${ED}/usr/lib/${PN}/${SLOT}/bin/${i}" "${ED}/usr/lib/${PN}/${SLOT}/bin/${ver_i}" || die
|
||||||
@ -728,7 +728,6 @@ src_install() {
|
|||||||
ewarn "please report this"
|
ewarn "please report this"
|
||||||
fi
|
fi
|
||||||
dosym "../lib/${PN}/${SLOT}/bin/${ver_i}" "/usr/bin/${ver_i}"
|
dosym "../lib/${PN}/${SLOT}/bin/${ver_i}" "/usr/bin/${ver_i}"
|
||||||
dosym "../lib/${PN}/${SLOT}/bin/${ver_i}" "/usr/bin/${i}-${PV%%_*}"
|
|
||||||
done
|
done
|
||||||
|
|
||||||
# symlinks to switch components to active rust in eselect
|
# symlinks to switch components to active rust in eselect
|
@ -94,7 +94,7 @@ BDEPEND="${PYTHON_DEPS}
|
|||||||
>=sys-devel/gcc-4.7[cxx]
|
>=sys-devel/gcc-4.7[cxx]
|
||||||
>=llvm-core/clang-3.5
|
>=llvm-core/clang-3.5
|
||||||
)
|
)
|
||||||
lto? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )
|
lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) )
|
||||||
!system-llvm? (
|
!system-llvm? (
|
||||||
>=dev-build/cmake-3.13.4
|
>=dev-build/cmake-3.13.4
|
||||||
app-alternatives/ninja
|
app-alternatives/ninja
|
||||||
|
Loading…
x
Reference in New Issue
Block a user