| Summary: | =dev-lang/rust-1.86.0 : eselect-rust fails to symlink tools due to SLOT change | ||
|---|---|---|---|
| Product: | Gentoo Linux | Reporter: | Karl-Johan Karlsson <creideiki+gentoo-bugzilla> |
| Component: | Current packages | Assignee: | Gentoo Rust Project <rust> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | CC: | holger, matoro_gentoo, navi, randy |
| Priority: | Normal | Keywords: | PATCH, PMASKED |
| Version: | unspecified | ||
| Hardware: | All | ||
| OS: | Linux | ||
| See Also: |
https://bugs.gentoo.org/show_bug.cgi?id=953103 https://bugs.gentoo.org/show_bug.cgi?id=953130 |
||
| Whiteboard: | |||
| Package list: | Runtime testing required: | --- | |
| Bug Depends on: | 953747 | ||
| Bug Blocks: | |||
| Attachments: | Patch changing ${P} to ${PN}-${SLOT} in file names | ||
Created attachment 923575 [details, diff]
Patch changing ${P} to ${PN}-${SLOT} in file names
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b89c58da1802c889e4445c03d5a54acafef8372d commit b89c58da1802c889e4445c03d5a54acafef8372d Author: Arthur Zamarin <arthurzam@gentoo.org> AuthorDate: 2025-04-04 18:59:57 +0000 Commit: Arthur Zamarin <arthurzam@gentoo.org> CommitDate: 2025-04-04 18:59:57 +0000 dev-lang/rust{,-bin}: mask 1.86.0 Temporary mask until handled the usage of shorter SLOT. Bug: https://bugs.gentoo.org/953103 Bug: https://bugs.gentoo.org/953127 Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org> profiles/package.mask | 6 ++++++ 1 file changed, 6 insertions(+) The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab7539f2f0bf97b90c22d860a91bcbe321f4a0e commit 3ab7539f2f0bf97b90c22d860a91bcbe321f4a0e Author: Arthur Zamarin <arthurzam@gentoo.org> AuthorDate: 2025-04-13 15:36:25 +0000 Commit: Arthur Zamarin <arthurzam@gentoo.org> CommitDate: 2025-04-13 15:38:57 +0000 dev-lang/rust{,-bin}: update SLOT back to ${PV} We have issues and breakage with the shorter SLOT. Currently Rust project has no capacty to fix it. For more details see the frist bug. Bug: https://bugs.gentoo.org/953747 Closes: https://bugs.gentoo.org/953103 Closes: https://bugs.gentoo.org/953127 Closes: https://bugs.gentoo.org/953130 Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org> .../rust-bin/{rust-bin-1.86.0.ebuild => rust-bin-1.86.0-r1.ebuild} | 2 +- dev-lang/rust/{rust-1.86.0.ebuild => rust-1.86.0-r1.ebuild} | 5 ++--- eclass/rust.eclass | 4 ++-- profiles/base/package.use.force | 4 ++-- profiles/package.mask | 6 ------ 5 files changed, 7 insertions(+), 14 deletions(-) |
After upgrading to =dev-lang/rust-1.86.0, I have symlinks for the core binaries (rustc, etc.), but not for the optional tools (rust-analyzer, rustfmt, etc.): $ ls -l /usr/bin/rust* | cut -c40- | grep -E '(analyzer|rustc)' /usr/bin/rust-analyzer-1.85.1 -> ../lib/rust/1.85.1/bin/rust-analyzer-1.85.1 /usr/bin/rust-analyzer-1.86 -> ../lib/rust/1.86/bin/rust-analyzer-1.86 /usr/bin/rust-analyzer-1.86.0 -> ../lib/rust/1.86/bin/rust-analyzer-1.86 /usr/bin/rustc -> rustc-1.86 /usr/bin/rustc-1.85.1 -> ../lib/rust/1.85.1/bin/rustc-1.85.1 /usr/bin/rustc-1.86 -> ../lib/rust/1.86/bin/rustc-1.86 /usr/bin/rustc-1.86.0 -> ../lib/rust/1.86/bin/rustc-1.86 I build 1.85.1 and 1.86.0 with the same flags. The symlinks are created by eselect-rust, which looks for a file named /etc/env.d/rust/provider-rust-${VERSION}: https://gitweb.gentoo.org/proj/eselect-rust.git/tree/rust.eselect.in#n45 Looking at those files, the tool binaries are present in 1.85.1, but missing from the 1.86.0 version: $ diff -u /etc/env.d/rust/provider-rust-1.85.1 /etc/env.d/rust/provider-rust-1.86 --- /etc/env.d/rust/provider-rust-1.85.1 2025-03-31 23:17:27.081587958 +0200 +++ /etc/env.d/rust/provider-rust-1.86 2025-04-04 19:34:30.303772044 +0200 @@ -7,9 +7,3 @@ /usr/lib/rust/lib /usr/lib/rust/man /usr/share/doc/rust -/usr/bin/clippy-driver -/usr/bin/cargo-clippy -/usr/bin/rustfmt -/usr/bin/cargo-fmt -/usr/lib/rust/libexec -/usr/bin/rust-analyzer Copying the missing lines from /etc/env.d/rust/provider-rust-1.85.1 to/etc/env.d/rust/provider-rust-1.86 and re-running "eselect rust set 1.86" creates all the symlinks, which confirms that the missing lines are the immediate problem. The provider files are installed by dev-lang/rust itself: $ qfile /etc/env.d/rust/provider-rust-* dev-lang/rust: /etc/env.d/rust/provider-rust-1.86 dev-lang/rust: /etc/env.d/rust/provider-rust-1.85.1 And the code in the dev-lang/rust ebuilds to write those files is identical: https://github.com/gentoo/gentoo/blob/d80c323788add32468934512ad66c1bc3fd4027c/dev-lang/rust/rust-1.86.0.ebuild#L750 However, there is a change in how the SLOT is calculated for 1.86.0: $ grep ^SLOT= rust-1.8[56].0.ebuild rust-1.85.0.ebuild:SLOT="${PV%%_*}" # Beta releases get to share the same SLOT as the eventual stable rust-1.86.0.ebuild:SLOT="$(ver_cut 1-2)" So stable versions 1.85.1 and below get a SLOT which is the entire ${PV} (1.85.1) whereas 1.86.0 only gets the first two components (1.86): # eix -e dev-lang/rust | grep -E '1\.8[56]' | grep -v Installed (1.85.0) (~)1.85.0^t{xpak} (~)1.85.0-r1^t{xpak} (1.85.1) (~)1.85.1^t{xpak:2} (1.86) (~)1.86.0^t{xpak} For the code which writes the provider file, this makes a difference. The lines referring to the core binaries get written to a file called "provider-${PN}-${SLOT}", which is "provider-rust-1.86": https://github.com/gentoo/gentoo/blob/d80c323788add32468934512ad66c1bc3fd4027c/dev-lang/rust/rust-1.86.0.ebuild#L750 And the lines referring to the tools get written to a file called "provider-${P}", which is "provider-rust-1.86.0": https://github.com/gentoo/gentoo/blob/d80c323788add32468934512ad66c1bc3fd4027c/dev-lang/rust/rust-1.86.0.ebuild#L775 At the end, only "provider-${PN}-${SLOT}" ("provider-rust-1.86") gets installed, while "provider-${P}" ("provider-rust-1.86.0") is discarded: https://github.com/gentoo/gentoo/blob/d80c323788add32468934512ad66c1bc3fd4027c/dev-lang/rust/rust-1.86.0.ebuild#L780 >=dev-lang/rust-1.86.0 should be updated to write all lines in the provider file to the same file. Reproducible: Always Steps to Reproduce: 1. env USE="clippy rust-analyzer rust-src rustfmt" emerge -a1 =dev-lang/rust-1.85.1 2. eselect rust set 1.85.1 3. type rust-analyzer rust-analyzer is /usr/bin/rust-analyzer 4. env USE="clippy rust-analyzer rust-src rustfmt" emerge -a1 =dev-lang/rust-1.86.0 5. eselect rust set 1.86.0 6. type rust-analyzer bash: type: rust-analyzer: not found Portage 3.0.67 (python 3.12.9-final-0, default/linux/amd64/23.0/split-usr/hardened, gcc-14, glibc-2.41-r1, 6.13.9-gentoo-x86_64 x86_64) ================================================================= System Settings ================================================================= System uname: Linux-6.13.9-gentoo-x86_64-x86_64-Intel-R-_Core-TM-_i7-4770K_CPU_@_3.50GHz-with-glibc2.41 KiB Mem: 32797004 total, 2858416 free KiB Swap: 31702012 total, 31701896 free Timestamp of repository gentoo: Thu, 03 Apr 2025 21:45:00 +0000 Head commit of repository gentoo: a468df38e533e83c34cbbea1e07d9d03a5147597 Head commit of repository creideiki: b1e895a6a4294e194bcb00a66ac4bf4409f41ead Timestamp of repository steam-overlay: Thu, 03 Apr 2025 19:20:32 +0000 Head commit of repository steam-overlay: 781fbee2259287d1b02753d4c02d029ce9f4f68b Timestamp of repository torbrowser: Thu, 03 Apr 2025 19:20:34 +0000 Head commit of repository torbrowser: 120e23f3800bb15a625f5bf5c76a9adfc198f203 sh bash 5.2_p37 ld GNU ld (Gentoo 2.44 p1) 2.44.0 app-misc/pax-utils: 1.3.8::gentoo app-shells/bash: 5.2_p37::gentoo dev-build/autoconf: 2.72-r1::gentoo dev-build/automake: 1.16.5-r2::gentoo, 1.17-r2::gentoo dev-build/cmake: 3.31.6-r1::gentoo dev-build/libtool: 2.5.4::gentoo dev-build/make: 4.4.1-r100::gentoo dev-build/meson: 1.7.1::gentoo dev-lang/perl: 5.40.1::gentoo dev-lang/python: 3.10.16_p2::gentoo, 3.11.11_p2::gentoo, 3.12.9::gentoo, 3.13.2::gentoo, 3.13.2-r100::gentoo dev-lang/rust: 1.85.1::gentoo, 1.86.0::gentoo llvm-core/clang: 19.1.7::gentoo, 20.1.2::gentoo llvm-core/lld: 19.1.7::gentoo llvm-core/llvm: 19.1.7::gentoo, 20.1.2::gentoo sys-apps/baselayout: 2.17::gentoo sys-apps/openrc: 0.61::gentoo sys-apps/sandbox: 2.46::gentoo sys-devel/binutils: 2.44::gentoo sys-devel/binutils-config: 5.5.2::gentoo sys-devel/gcc: 14.2.1_p20250301::gentoo sys-devel/gcc-config: 2.12.1::gentoo sys-kernel/linux-headers: 6.14::gentoo (virtual/os-headers) sys-libs/glibc: 2.41-r1::gentoo Repositories: gentoo location: /usr/portage sync-type: rsync sync-uri: rsync://rsync.gentoo.org/gentoo-portage priority: -1000 volatile: True sync-rsync-verify-metamanifest: yes sync-rsync-verify-jobs: 1 sync-rsync-verify-max-age: 3 sync-rsync-extra-opts: creideiki location: /usr/local/portage sync-type: git sync-uri: https://github.com/creideiki/portage masters: gentoo priority: 0 volatile: True steam-overlay location: /var/db/repos/steam-overlay sync-type: git sync-uri: https://github.com/gentoo-mirror/steam-overlay.git masters: gentoo volatile: False torbrowser location: /var/db/repos/torbrowser sync-type: git sync-uri: https://github.com/gentoo-mirror/torbrowser.git masters: gentoo volatile: False ACCEPT_KEYWORDS="amd64 ~amd64" ACCEPT_LICENSE="@FREE" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-march=native -O2 -pipe" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/lib64/libreoffice/program/sofficerc /usr/share/config /usr/share/gnupg/qualified.txt /var/bind /var/ossec/etc" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/texmf/web2c /var/ossec/etc/shared" CXXFLAGS="-march=native -O2 -pipe" DISTDIR="/usr/portage/distfiles" EMERGE_DEFAULT_OPTS="--alphabetical --keep-going --quiet-build=n --backtrack=30 --verbose-conflicts" ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GDK_PIXBUF_MODULE_FILE GOBIN GOPATH PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR XDG_STATE_HOME" FCFLAGS="-O2 -pipe" FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs binpkg-multi-instance buildpkg buildpkg-live compressdebug config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync merge-wait multilib-strict network-sandbox news parallel-fetch pid-sandbox pkgdir-index-trusted preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms splitdebug strict strict-keepdir unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync warn-on-large-env xattr" FFLAGS="-O2 -pipe" GENTOO_MIRRORS="http://distfiles.gentoo.org" LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,-z,pack-relative-relocs -Wl,--hash-style=gnu -Wl,--enable-new-dtags" LEX="flex" MAKEOPTS="-j8" PKGDIR="/usr/portage/packages" PORTAGE_CONFIGROOT="/" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git" PORTAGE_TMPDIR="/var/tmp" SHELL="/bin/bash" USE="X acl alsa amd64 bluray bzip2 cet crypt cups dav1d dbus dvd egl elogind emacs eselect-ldso exif ffmpeg flac gdbm gif gles2 hackrf hardened harfbuzz heif iconv icu idn ipv6 jpeg jpeg2k jpegxl kde kf6compat libtirpc llvm lm-sensors mng multilib ncurses nls ogg opencl opengl openmp orc pam pcre pdf pic pie pipewire plasma png postscript qml qt5 qt6 rav1e readline screencast seccomp split-usr ssl ssp svg test-rust tiff unicode vaapi vorbis vpx vulkan wayland webp wmf x264 x265 xattr xpm xtpax zlib" ABI_X86="64" ADA_TARGET="gcc_14" ALSA_CARDS="hda-intel" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_anon authn_dbm authn_file authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir env expires ext_filter file_cache filter headers include info log_config logio mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" CAMERAS="canon" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt rdrand sse sse2 sse3 sse4_1 sse4_2 ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax navcom oceanserver oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 tsip tripmate tnt ublox" GRUB_PLATFORMS="pc" GUILE_SINGLE_TARGET="3-0" GUILE_TARGETS="3-0" INPUT_DEVICES="libinput evdev wacom" KERNEL="linux" L10N="en en-US en-GB sv" LCD_DEVICES="bayrad cfontz glk hd44780 lb216 lcdm001 mtxorb text" LLVM_SLOT="19" LLVM_TARGETS="BPF AMDGPU X86" LUA_SINGLE_TARGET="lua5-1" LUA_TARGETS="lua5-1" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php8-2" POSTGRES_TARGETS="postgres17" PYTHON_SINGLE_TARGET="python3_12" PYTHON_TARGETS="python3_12" QEMU_SOFTMMU_TARGETS="i386 x86_64 aarch64 arm" RUBY_TARGETS="ruby33 ruby34" SANE_BACKENDS="hp" VIDEO_CARDS="amdgpu radeonsi" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipp2p iface geoip fuzzy condition tarpit sysrq proto logmark ipmark dhcpmac delude chaos account" Unset: ADDR2LINE, AR, ARFLAGS, AS, ASFLAGS, CC, CCLD, CONFIG_SHELL, CPP, CPPFLAGS, CTARGET, CXX, CXXFILT, ELFEDIT, EXTRA_ECONF, F77FLAGS, FC, GCOV, GPROF, INSTALL_MASK, LANG, LC_ALL, LD, LFLAGS, LIBTOOL, LINGUAS, MAKE, MAKEFLAGS, NM, OBJCOPY, OBJDUMP, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, PYTHONPATH, RANLIB, READELF, RUSTFLAGS, SIZE, STRINGS, STRIP, YACC, YFLAGS ================================================================= Package Settings ================================================================= dev-lang/rust-1.85.1::gentoo was built with the following: USE="(-big-endian) clippy -debug -dist -doc (-llvm-libunwind) -lto rust-analyzer rust-src rustfmt system-llvm -test -verify-sig -wasm" ABI_X86="32 (64) (-x32)" CPU_FLAGS_X86="sse2" LLVM_SLOT="(19)" LLVM_TARGETS="-AArch64 AMDGPU -ARC -ARM -AVR BPF -CSKY -DirectX -Hexagon -Lanai -LoongArch -M68k -MSP430 -Mips -NVPTX -PowerPC -RISCV -SPIRV -Sparc -SystemZ -VE -WebAssembly (X86) -XCore -Xtensa" CFLAGS="-O2 -march=native -pipe" CXXFLAGS="-O2 -march=native -pipe" dev-lang/rust-1.86.0::gentoo was built with the following: USE="(-big-endian) clippy -debug -dist -doc (-llvm-libunwind) -lto rust-analyzer rust-src rustfmt system-llvm -test -verify-sig -wasm" ABI_X86="32 (64) (-x32)" CPU_FLAGS_X86="sse2" LLVM_SLOT="(19)" LLVM_TARGETS="-AArch64 AMDGPU -ARC -ARM -AVR BPF -CSKY -DirectX -Hexagon -Lanai -LoongArch -M68k -MSP430 -Mips -NVPTX -PowerPC -RISCV -SPIRV -Sparc -SystemZ -VE -WebAssembly (X86) -XCore -Xtensa" CFLAGS="-O2 -march=native -pipe" CXXFLAGS="-O2 -march=native -pipe"