diff options
| author | Matt Jolly <kangie@gentoo.org> | 2024-11-03 11:36:26 +1000 |
|---|---|---|
| committer | Matt Jolly <kangie@gentoo.org> | 2024-11-09 16:25:33 +1000 |
| commit | a73b0b02a99e85e7aa87f9133b4f898b658c30a7 (patch) | |
| tree | 8f16c77f58b12be6f4d2494aaf47b119ce36a2a0 /dev-lang/rust-common | |
| parent | 583a1a9ac556d01e1b0df6fe64e67cb646fa4118 (diff) | |
| download | gentoo-a73b0b02a99e85e7aa87f9133b4f898b658c30a7.tar.gz gentoo-a73b0b02a99e85e7aa87f9133b4f898b658c30a7.tar.bz2 gentoo-a73b0b02a99e85e7aa87f9133b4f898b658c30a7.zip | |
dev-lang/rust{,-bin}: port to llvm-r1 and slot (-r100)
Port to llvm-r1 to gain the fancy new `llvm_slot_{x}` USE flags
which we use in the rust eclass to force a closer dependency on
specific LLVM slots.
Since Rust in Gentoo is only ever built against the one LLVM slot
we are able to simplify the LLVM logic in the Rust ebuilds and use
our knowledge of the LLVM -> Rust version mapping to enable
slots for dev-lang/rust in a usable manner.
Since Rust is now slotted and not managed entirely by eselect-rust
each slot needs to be added to LDPATH.
We also drop the `profiler` USE as it's inconsistent with what
upstream ship by default and casues issues where other package's
build systems assume that it exists.
This commit also introduces dev-lang/rust-common which handles bash
completions for slotted Rust.
dev-lang/rust-bin:
`LLVM_OPTIONAL` is used as we don't need to consume LLVM,
we really just want the free IUSE.
Closes: https://bugs.gentoo.org/941146
Signed-off-by: Matt Jolly <kangie@gentoo.org>
Diffstat (limited to 'dev-lang/rust-common')
| -rw-r--r-- | dev-lang/rust-common/Manifest | 4 | ||||
| -rw-r--r-- | dev-lang/rust-common/metadata.xml | 11 | ||||
| -rw-r--r-- | dev-lang/rust-common/rust-common-1.81.0.ebuild | 53 | ||||
| -rw-r--r-- | dev-lang/rust-common/rust-common-1.82.0.ebuild | 54 |
4 files changed, 122 insertions, 0 deletions
diff --git a/dev-lang/rust-common/Manifest b/dev-lang/rust-common/Manifest new file mode 100644 index 000000000000..88ff26dbed31 --- /dev/null +++ b/dev-lang/rust-common/Manifest @@ -0,0 +1,4 @@ +DIST rustc-1.81.0-src.tar.xz 216743872 BLAKE2B d9f52da9092d0723c862ebbb2dc351cad0670be6872f691b4c9f36faf06803f072720ebd04f06745c355d807991b38312cc830b12d6d3f50b0574bb7325340b7 SHA512 b8a837ced521d2ca2c7f228a0640da591384519e4dbc1ae768524d50616da6abbd2f7bdae3777caebc0447dac91bf76481282ce5a2264d7f30e173caa6321a51 +DIST rustc-1.81.0-src.tar.xz.asc 801 BLAKE2B 01cd9f386d3fd73f4eb43b14d7d479ebababb8640abbff170e697817b94b8a18edd801c6047ecf3c084a0a51764c5e4f3f4bd6b00e8ae000ef0b850e9506572a SHA512 19c0da9d67f2bd9fd79a2078f0f486ee7fad5646a09a609b7e30d9531851955ae8df0ec69f9ddc09e2fd6e74d529648335b0fda833839c88c54c84494ec1988e +DIST rustc-1.82.0-src.tar.xz 219769328 BLAKE2B 611f33e134c2d459c9af1695c0a4d033df93afc986e91a17fceb0dd293fb4ffbd5f7475ef571d36cecf49da6c3fdb3801c98d7f72f9dd1c39e42502f649b192f SHA512 d158c7c71c1814bde2a3ec3cbeabe34949bd3201b730c0d7ec6baad4158bb28dd13696c430a6b99dc38b9d23ad7ddf8dde7d2487cbfbbbe9c3473016994210f0 +DIST rustc-1.82.0-src.tar.xz.asc 801 BLAKE2B 8138fb15b8d7ec15be45378fe663207a8e87e3c527348ab079995b1840a771ed6e9d5464eb8855ac9e006c0cfcf54b1a4fea489d31e6c9899cb03e6f4c737b67 SHA512 3cd6b27e72041baf9996efa10f25aca2e04f3e3727b60ecfd90c1bef9c52d216d2dc130802f935b110e35766645a27637a01661aa8d5acf02bf64b02a107c93c diff --git a/dev-lang/rust-common/metadata.xml b/dev-lang/rust-common/metadata.xml new file mode 100644 index 000000000000..b5c189c5f9b0 --- /dev/null +++ b/dev-lang/rust-common/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>rust@gentoo.org</email> + <name>Rust Project</name> + </maintainer> + <upstream> + <remote-id type="github">rust-lang/rust</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-lang/rust-common/rust-common-1.81.0.ebuild b/dev-lang/rust-common/rust-common-1.81.0.ebuild new file mode 100644 index 000000000000..fadef8ec46b5 --- /dev/null +++ b/dev-lang/rust-common/rust-common-1.81.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 + +DESCRIPTION="Common files shared between multiple slots of Rust" +HOMEPAGE="https://www.rust-lang.org/" + +if [[ ${PV} = *beta* ]]; then + betaver=${PV//*beta} + BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}" + SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz" +else + ABI_VER="$(ver_cut 1-2)" + MY_P="rustc-${PV}" + SRC="${MY_P}-src.tar.xz" +fi + +SRC_URI=" + https://static.rust-lang.org/dist/${SRC} + verify-sig? ( https://static.rust-lang.org/dist/${SRC}.asc ) +" +S="${WORKDIR}/${MY_P}-src" + +LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" +SLOT=0 +KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86" +IUSE="verify-sig" + +RDEPEND=" + !dev-lang/rust:stable/1.71.1 + !dev-lang/rust:stable/1.74.1 + !dev-lang/rust:stable/1.75.0 + !dev-lang/rust:stable/1.77.1 + !dev-lang/rust:stable/1.79.0 + !dev-lang/rust:stable/1.80.1 + !dev-lang/rust:stable/1.81.0 + !dev-lang/rust:stable/1.82.0 +" + +src_configure() { + : +} + +src_compile() { + : +} + +src_install() { + newbashcomp src/tools/cargo/src/etc/cargo.bashcomp.sh cargo +} diff --git a/dev-lang/rust-common/rust-common-1.82.0.ebuild b/dev-lang/rust-common/rust-common-1.82.0.ebuild new file mode 100644 index 000000000000..c1d6b791917f --- /dev/null +++ b/dev-lang/rust-common/rust-common-1.82.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 + +DESCRIPTION="Common files shared between multiple slots of Rust" +HOMEPAGE="https://www.rust-lang.org/" + +if [[ ${PV} = *beta* ]]; then + betaver=${PV//*beta} + BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}" + SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz" +else + ABI_VER="$(ver_cut 1-2)" + MY_P="rustc-${PV}" + SRC="${MY_P}-src.tar.xz" +fi + +SRC_URI=" + https://static.rust-lang.org/dist/${SRC} + verify-sig? ( https://static.rust-lang.org/dist/${SRC}.asc ) +" +S="${WORKDIR}/${MY_P}-src" + +LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" +SLOT=0 +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="verify-sig" + +# Legacy non-slotted versions bash completions will collide. +RDEPEND=" + !dev-lang/rust:stable/1.71.1 + !dev-lang/rust:stable/1.74.1 + !dev-lang/rust:stable/1.75.0 + !dev-lang/rust:stable/1.77.1 + !dev-lang/rust:stable/1.79.0 + !dev-lang/rust:stable/1.80.1 + !dev-lang/rust:stable/1.81.0 + !dev-lang/rust:stable/1.82.0 +" + +src_configure() { + : +} + +src_compile() { + : +} + +src_install() { + newbashcomp src/tools/cargo/src/etc/cargo.bashcomp.sh cargo +} |
