www-client/icecat: update for slotted Rust
Signed-off-by: Alfred Wingate <parona@protonmail.com>
This commit is contained in:
parent
8833cc8b58
commit
2468e637b1
@ -8,17 +8,18 @@ EAPI=8
|
||||
# Using Gentoos firefox patches as system libraries and lto are quite nice
|
||||
FIREFOX_PATCHSET="firefox-115esr-patches-13.tar.xz"
|
||||
|
||||
LLVM_MAX_SLOT=18
|
||||
LLVM_COMPAT=(17 18)
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..11} )
|
||||
PYTHON_REQ_USE="ncurses,sqlite,ssl"
|
||||
RUST_NEEDS_LLVM=1
|
||||
|
||||
WANT_AUTOCONF="2.1"
|
||||
|
||||
VIRTUALX_REQUIRED="manual"
|
||||
|
||||
inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing \
|
||||
optfeature pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg
|
||||
inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
|
||||
optfeature pax-utils python-any-r1 readme.gentoo-r1 rust toolchain-funcs virtualx xdg
|
||||
|
||||
DESCRIPTION="GNU IceCat Web Browser"
|
||||
HOMEPAGE="https://www.gnu.org/software/gnuzilla/"
|
||||
@ -53,48 +54,20 @@ REQUIRED_USE="|| ( X wayland )
|
||||
FF_ONLY_DEPEND="screencast? ( media-video/pipewire:= )
|
||||
selinux? ( sec-policy/selinux-mozilla )"
|
||||
BDEPEND="${PYTHON_DEPS}
|
||||
|| (
|
||||
(
|
||||
sys-devel/clang:18
|
||||
sys-devel/llvm:18
|
||||
$(llvm_gen_dep '
|
||||
sys-devel/clang:${LLVM_SLOT}
|
||||
sys-devel/llvm:${LLVM_SLOT}
|
||||
clang? (
|
||||
sys-devel/lld:18
|
||||
virtual/rust:0/llvm-18
|
||||
pgo? ( =sys-libs/compiler-rt-sanitizers-18*[profile] )
|
||||
)
|
||||
)
|
||||
(
|
||||
sys-devel/clang:17
|
||||
sys-devel/llvm:17
|
||||
clang? (
|
||||
sys-devel/lld:17
|
||||
virtual/rust:0/llvm-17
|
||||
pgo? ( =sys-libs/compiler-rt-sanitizers-17*[profile] )
|
||||
)
|
||||
)
|
||||
(
|
||||
sys-devel/clang:16
|
||||
sys-devel/llvm:16
|
||||
clang? (
|
||||
sys-devel/lld:16
|
||||
virtual/rust:0/llvm-16
|
||||
pgo? ( =sys-libs/compiler-rt-sanitizers-16*[profile] )
|
||||
)
|
||||
)
|
||||
sys-devel/lld:${LLVM_SLOT}
|
||||
)
|
||||
pgo? ( sys-libs/compiler-rt-sanitizers:${LLVM_SLOT}[profile] )
|
||||
')
|
||||
app-alternatives/awk
|
||||
app-arch/unzip
|
||||
app-arch/zip
|
||||
>=dev-util/cbindgen-0.24.3
|
||||
net-libs/nodejs
|
||||
virtual/pkgconfig
|
||||
!clang? ( virtual/rust )
|
||||
!elibc_glibc? (
|
||||
|| (
|
||||
dev-lang/rust
|
||||
<dev-lang/rust-bin-1.73
|
||||
)
|
||||
)
|
||||
amd64? ( >=dev-lang/nasm-2.14 )
|
||||
x86? ( >=dev-lang/nasm-2.14 )
|
||||
pgo? (
|
||||
@ -210,11 +183,6 @@ llvm_check_deps() {
|
||||
return 1
|
||||
fi
|
||||
|
||||
if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
|
||||
einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
if use pgo ; then
|
||||
if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
|
||||
einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!"
|
||||
@ -523,7 +491,8 @@ pkg_setup() {
|
||||
|
||||
check-reqs_pkg_setup
|
||||
|
||||
llvm_pkg_setup
|
||||
llvm-r1_pkg_setup
|
||||
rust_pkg_setup
|
||||
|
||||
if use clang && use lto && tc-ld-is-lld ; then
|
||||
local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
|
Loading…
Reference in New Issue
Block a user