diff options
| author | Matt Jolly <kangie@gentoo.org> | 2024-11-18 14:45:41 +1000 |
|---|---|---|
| committer | Matt Jolly <kangie@gentoo.org> | 2024-11-18 15:39:59 +1000 |
| commit | c03602c25c7a357d4e391a20f72a30c1a880bb9e (patch) | |
| tree | 2a88c61b95785abb82b5e15e1f1b681da7762b96 /dev-lang/rust/rust-1.75.0-r100.ebuild | |
| parent | 047579dd5fdbd32b836c75634fdce4d7ddf89607 (diff) | |
| download | gentoo-c03602c25c7a357d4e391a20f72a30c1a880bb9e.tar.gz gentoo-c03602c25c7a357d4e391a20f72a30c1a880bb9e.tar.bz2 gentoo-c03602c25c7a357d4e391a20f72a30c1a880bb9e.zip | |
dev-lang/rust: libexec-${PV} symlink requires USE=rust-analyzer
Until 1.72.0 `cargo-credential-1password` was installed in
`/usr/lib/rust/${PV}/libexec`, and we were able to unconditionally
symlink that for eselect-rust to use.
This is no longer the case and most of the time users end up
with a broken symlink for each rust slot in /usr/lib/rust.
Gate the symlink creation with the appropriate USE and
conditionally add `/usr/lib/rust/libexec` to the
eselect-rust provider config.
Closes: https://bugs.gentoo.org/915403
Signed-off-by: Matt Jolly <kangie@gentoo.org>
Diffstat (limited to 'dev-lang/rust/rust-1.75.0-r100.ebuild')
| -rw-r--r-- | dev-lang/rust/rust-1.75.0-r100.ebuild | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/dev-lang/rust/rust-1.75.0-r100.ebuild b/dev-lang/rust/rust-1.75.0-r100.ebuild index 68b0dce91e37..cb184ff3fe86 100644 --- a/dev-lang/rust/rust-1.75.0-r100.ebuild +++ b/dev-lang/rust/rust-1.75.0-r100.ebuild @@ -601,7 +601,7 @@ src_install() { # symlinks to switch components to active rust in eselect dosym "${PV}/lib" "/usr/lib/${PN}/lib-${PV}" - dosym "${PV}/libexec" "/usr/lib/${PN}/libexec-${PV}" + use rust-analyzer && dosym "${PV}/libexec" "/usr/lib/${PN}/libexec-${PV}" dosym "${PV}/share/man" "/usr/lib/${PN}/man-${PV}" dosym "rust/${PV}/lib/rustlib" "/usr/lib/rustlib-${PV}" dosym "../../lib/${PN}/${PV}/share/doc/rust" "/usr/share/doc/${P}" @@ -625,7 +625,6 @@ src_install() { /usr/bin/rust-lldb /usr/lib/rustlib /usr/lib/rust/lib - /usr/lib/rust/libexec /usr/lib/rust/man /usr/share/doc/rust _EOF_ @@ -643,9 +642,9 @@ src_install() { echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" fi if use rust-analyzer; then + echo /usr/lib/rust/libexec >> "${T}/provider-${P}" echo /usr/bin/rust-analyzer >> "${T}/provider-${P}" fi - insinto /etc/env.d/rust doins "${T}/provider-${P}" |