mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-20 22:27:17 -08:00
*/*: Rust -> llvm-r2
This commit updates the Rust and Cargo eclasses to use/support llvm-r2 (from llvm-r1). Packages that require Rust and LLVM to be tightly coupled (i.e. RUST_NEEDS_LLVM set) have been updated here to ensure successful builds. Signed-off-by: Matt Jolly <kangie@gentoo.org>
This commit is contained in:
@@ -258,7 +258,7 @@ LLVM_COMPAT=( {19..21} )
|
||||
RUST_MIN_VER="1.85.0"
|
||||
RUST_NEEDS_LLVM=1
|
||||
|
||||
inherit cargo llvm-r1
|
||||
inherit cargo llvm-r2
|
||||
|
||||
DESCRIPTION="Implementation of the RPM PGP interface using Sequoia"
|
||||
HOMEPAGE="https://sequoia-pgp.org/ https://github.com/rpm-software-management/rpm-sequoia"
|
||||
@@ -295,7 +295,7 @@ BDEPEND="
|
||||
QA_FLAGS_IGNORED="usr/lib.*/librpm_sequoia.so.1"
|
||||
|
||||
pkg_setup() {
|
||||
llvm-r1_pkg_setup
|
||||
llvm-r2_pkg_setup
|
||||
rust_pkg_setup
|
||||
}
|
||||
|
||||
|
||||
@@ -172,7 +172,7 @@ pkg_setup() {
|
||||
strip-unsupported-flags
|
||||
# flags from upstream
|
||||
export RUSTFLAGS="${RUSTFLAGS} -C symbol-mangling-version=v0 --cfg tokio_unstable -C link-args=-Wl,--disable-new-dtags,-rpath,\$ORIGIN/../lib"
|
||||
llvm-r1_pkg_setup
|
||||
llvm-r2_pkg_setup
|
||||
rust_pkg_setup
|
||||
}
|
||||
|
||||
|
||||
@@ -172,7 +172,7 @@ pkg_setup() {
|
||||
strip-unsupported-flags
|
||||
# flags from upstream
|
||||
export RUSTFLAGS="${RUSTFLAGS} -C symbol-mangling-version=v0 --cfg tokio_unstable -C link-args=-Wl,--disable-new-dtags,-rpath,\$ORIGIN/../lib"
|
||||
llvm-r1_pkg_setup
|
||||
llvm-r2_pkg_setup
|
||||
rust_pkg_setup
|
||||
}
|
||||
|
||||
|
||||
@@ -168,7 +168,7 @@ pkg_setup() {
|
||||
strip-unsupported-flags
|
||||
# flags from upstream
|
||||
export RUSTFLAGS="${RUSTFLAGS} -C symbol-mangling-version=v0 --cfg tokio_unstable -C link-args=-Wl,--disable-new-dtags,-rpath,\$ORIGIN/../lib"
|
||||
llvm-r1_pkg_setup
|
||||
llvm-r2_pkg_setup
|
||||
rust_pkg_setup
|
||||
}
|
||||
|
||||
|
||||
@@ -185,7 +185,7 @@ pkg_setup() {
|
||||
strip-unsupported-flags
|
||||
# flags from upstream
|
||||
export RUSTFLAGS="${RUSTFLAGS} -C symbol-mangling-version=v0 --cfg tokio_unstable -C link-args=-Wl,--disable-new-dtags,-rpath,\$ORIGIN/../lib"
|
||||
llvm-r1_pkg_setup
|
||||
llvm-r2_pkg_setup
|
||||
rust_pkg_setup
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ PYTHON_REQ_USE="ncurses,ssl,xml(+)"
|
||||
|
||||
WANT_AUTOCONF="2.1"
|
||||
|
||||
inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing python-any-r1 rust toolchain-funcs
|
||||
inherit autotools check-reqs flag-o-matic llvm-r2 multiprocessing python-any-r1 rust toolchain-funcs
|
||||
|
||||
MY_PN="mozjs"
|
||||
MY_PV="${PV/_pre*}"
|
||||
@@ -197,7 +197,7 @@ pkg_setup() {
|
||||
fi
|
||||
|
||||
check-reqs_pkg_setup
|
||||
llvm-r1_pkg_setup
|
||||
llvm-r2_pkg_setup
|
||||
rust_pkg_setup
|
||||
python-any-r1_pkg_setup
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ PYTHON_REQ_USE="ncurses,ssl,xml(+)"
|
||||
|
||||
WANT_AUTOCONF="2.1"
|
||||
|
||||
inherit check-reqs flag-o-matic llvm-r1 multiprocessing python-any-r1 rust toolchain-funcs
|
||||
inherit check-reqs flag-o-matic llvm-r2 multiprocessing python-any-r1 rust toolchain-funcs
|
||||
|
||||
MY_PN="mozjs"
|
||||
MY_PV="${PV/_pre*}"
|
||||
@@ -196,7 +196,7 @@ pkg_setup() {
|
||||
fi
|
||||
|
||||
check-reqs_pkg_setup
|
||||
llvm-r1_pkg_setup
|
||||
llvm-r2_pkg_setup
|
||||
rust_pkg_setup
|
||||
python-any-r1_pkg_setup
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ PYTHON_REQ_USE="ncurses,ssl,xml(+)"
|
||||
|
||||
WANT_AUTOCONF="2.1"
|
||||
|
||||
inherit check-reqs flag-o-matic llvm-r1 multiprocessing python-any-r1 rust toolchain-funcs
|
||||
inherit check-reqs flag-o-matic llvm-r2 multiprocessing python-any-r1 rust toolchain-funcs
|
||||
|
||||
MY_PN="mozjs"
|
||||
MY_PV="${PV/_pre*}"
|
||||
@@ -196,7 +196,7 @@ pkg_setup() {
|
||||
fi
|
||||
|
||||
check-reqs_pkg_setup
|
||||
llvm-r1_pkg_setup
|
||||
llvm-r2_pkg_setup
|
||||
rust_pkg_setup
|
||||
python-any-r1_pkg_setup
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ PYTHON_REQ_USE="ncurses,ssl,xml(+)"
|
||||
|
||||
WANT_AUTOCONF="2.1"
|
||||
|
||||
inherit check-reqs flag-o-matic llvm-r1 multiprocessing python-any-r1 rust toolchain-funcs
|
||||
inherit check-reqs flag-o-matic llvm-r2 multiprocessing python-any-r1 rust toolchain-funcs
|
||||
|
||||
MY_PN="mozjs"
|
||||
MY_PV="${PV/_pre*}"
|
||||
@@ -196,7 +196,7 @@ pkg_setup() {
|
||||
fi
|
||||
|
||||
check-reqs_pkg_setup
|
||||
llvm-r1_pkg_setup
|
||||
llvm-r2_pkg_setup
|
||||
rust_pkg_setup
|
||||
python-any-r1_pkg_setup
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ LLVM_COMPAT=( {21..23} )
|
||||
RUST_REQ_USE="llvm_targets_BPF(+),rust_sysroots_bpf(-)"
|
||||
RUST_NEEDS_LLVM=1
|
||||
|
||||
inherit cargo llvm-r1 toolchain-funcs
|
||||
inherit cargo llvm-r2 toolchain-funcs
|
||||
|
||||
DESCRIPTION="Simple BPF static linker"
|
||||
HOMEPAGE="https://github.com/aya-rs/bpf-linker/"
|
||||
|
||||
@@ -15,7 +15,7 @@ LLVM_COMPAT=( {21..23} )
|
||||
RUST_REQ_USE="llvm_targets_BPF(+),rust_sysroots_bpf(-)"
|
||||
RUST_NEEDS_LLVM=1
|
||||
|
||||
inherit cargo llvm-r1 toolchain-funcs
|
||||
inherit cargo llvm-r2 toolchain-funcs
|
||||
|
||||
DESCRIPTION="Simple BPF static linker"
|
||||
HOMEPAGE="https://github.com/aya-rs/bpf-linker/"
|
||||
|
||||
@@ -15,7 +15,7 @@ LLVM_COMPAT=( {21..23} )
|
||||
RUST_REQ_USE="llvm_targets_BPF(+),rust_sysroots_bpf(-)"
|
||||
RUST_NEEDS_LLVM=1
|
||||
|
||||
inherit cargo llvm-r1 toolchain-funcs
|
||||
inherit cargo llvm-r2 toolchain-funcs
|
||||
|
||||
DESCRIPTION="Simple BPF static linker"
|
||||
HOMEPAGE="https://github.com/aya-rs/bpf-linker/"
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ if [[ -z ${_CARGO_ECLASS} ]]; then
|
||||
_CARGO_ECLASS=1
|
||||
|
||||
if [[ -n ${RUST_NEEDS_LLVM} ]]; then
|
||||
inherit llvm-r1
|
||||
inherit llvm-r2
|
||||
fi
|
||||
|
||||
if [[ -n ${CARGO_OPTIONAL} ]]; then
|
||||
|
||||
+2
-2
@@ -52,7 +52,7 @@ if [[ -z ${_RUST_ECLASS} ]]; then
|
||||
_RUST_ECLASS=1
|
||||
|
||||
if [[ -n ${RUST_NEEDS_LLVM} ]]; then
|
||||
inherit llvm-r1
|
||||
inherit llvm-r2
|
||||
fi
|
||||
|
||||
if [[ -n ${RUST_MULTILIB} ]]; then
|
||||
@@ -161,7 +161,7 @@ declare -a -g -r _RUST_SLOTS_ORDERED=(
|
||||
# packages that need a tight coupling between Rust and LLVM but don't
|
||||
# really care _which_ version of Rust is selected. Combine with
|
||||
# RUST_MAX_VER and RUST_MIN_VER to limit the range of Rust versions
|
||||
# that are acceptable. Will `die` if llvm-r1 is not inherited or
|
||||
# that are acceptable. Will `die` if llvm-r2 is not inherited or
|
||||
# an invalid combination of RUST and LLVM slots is detected; this probably
|
||||
# means that a LLVM slot in LLVM_COMPAT has had all of its Rust slots filtered.
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}"
|
||||
MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
|
||||
MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
|
||||
|
||||
inherit check-reqs desktop eapi9-ver flag-o-matic gnome2-utils linux-info llvm-r1 \
|
||||
inherit check-reqs desktop eapi9-ver flag-o-matic gnome2-utils linux-info llvm-r2 \
|
||||
multiprocessing optfeature pax-utils python-any-r1 rust toolchain-funcs virtualx xdg
|
||||
|
||||
DESCRIPTION="Thunderbird Mail Client"
|
||||
@@ -395,7 +395,7 @@ pkg_setup() {
|
||||
fi
|
||||
|
||||
check-reqs_pkg_setup
|
||||
llvm-r1_pkg_setup
|
||||
llvm-r2_pkg_setup
|
||||
rust_pkg_setup
|
||||
python-any-r1_pkg_setup
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}"
|
||||
MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
|
||||
MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
|
||||
|
||||
inherit check-reqs desktop eapi9-ver flag-o-matic gnome2-utils linux-info llvm-r1 \
|
||||
inherit check-reqs desktop eapi9-ver flag-o-matic gnome2-utils linux-info llvm-r2 \
|
||||
multiprocessing optfeature pax-utils python-any-r1 rust toolchain-funcs virtualx xdg
|
||||
|
||||
DESCRIPTION="Thunderbird Mail Client"
|
||||
@@ -395,7 +395,7 @@ pkg_setup() {
|
||||
fi
|
||||
|
||||
check-reqs_pkg_setup
|
||||
llvm-r1_pkg_setup
|
||||
llvm-r2_pkg_setup
|
||||
rust_pkg_setup
|
||||
python-any-r1_pkg_setup
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -198,7 +198,7 @@ LLVM_COMPAT=( {19..21} )
|
||||
RUST_MIN_VER="1.82.0"
|
||||
RUST_NEEDS_LLVM=1
|
||||
|
||||
inherit cargo llvm-r1
|
||||
inherit cargo llvm-r2
|
||||
|
||||
DESCRIPTION="A suite of tools for thin provisioning on Linux"
|
||||
HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
|
||||
@@ -250,7 +250,7 @@ PATCHES=(
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
llvm-r1_pkg_setup
|
||||
llvm-r2_pkg_setup
|
||||
rust_pkg_setup
|
||||
}
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}"
|
||||
MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
|
||||
MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
|
||||
|
||||
inherit check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
|
||||
inherit check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r2 multiprocessing \
|
||||
optfeature pax-utils python-any-r1 readme.gentoo-r1 rust toolchain-funcs virtualx xdg
|
||||
|
||||
MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
|
||||
@@ -421,7 +421,7 @@ pkg_setup() {
|
||||
fi
|
||||
|
||||
check-reqs_pkg_setup
|
||||
llvm-r1_pkg_setup
|
||||
llvm-r2_pkg_setup
|
||||
rust_pkg_setup
|
||||
python-any-r1_pkg_setup
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}"
|
||||
MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
|
||||
MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
|
||||
|
||||
inherit check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
|
||||
inherit check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r2 multiprocessing \
|
||||
optfeature pax-utils python-any-r1 readme.gentoo-r1 rust toolchain-funcs virtualx xdg
|
||||
|
||||
MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
|
||||
@@ -421,7 +421,7 @@ pkg_setup() {
|
||||
fi
|
||||
|
||||
check-reqs_pkg_setup
|
||||
llvm-r1_pkg_setup
|
||||
llvm-r2_pkg_setup
|
||||
rust_pkg_setup
|
||||
python-any-r1_pkg_setup
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}"
|
||||
MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
|
||||
MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
|
||||
|
||||
inherit check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
|
||||
inherit check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r2 multiprocessing \
|
||||
optfeature pax-utils python-any-r1 readme.gentoo-r1 rust toolchain-funcs virtualx xdg
|
||||
|
||||
MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
|
||||
@@ -421,7 +421,7 @@ pkg_setup() {
|
||||
fi
|
||||
|
||||
check-reqs_pkg_setup
|
||||
llvm-r1_pkg_setup
|
||||
llvm-r2_pkg_setup
|
||||
rust_pkg_setup
|
||||
python-any-r1_pkg_setup
|
||||
|
||||
|
||||
Reference in New Issue
Block a user