diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 40358 -> 40195 bytes | |||
| -rw-r--r-- | eclass/mono.eclass | 90 | ||||
| -rw-r--r-- | eclass/rust-toolchain.eclass | 59 | ||||
| -rw-r--r-- | eclass/rust.eclass | 6 |
4 files changed, 26 insertions, 129 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 259a0350b332..a34a007ff4ed 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/mono.eclass b/eclass/mono.eclass deleted file mode 100644 index d4f45e5acf70..000000000000 --- a/eclass/mono.eclass +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: mono.eclass -# @MAINTAINER: -# maintainer-needed@gentoo.org -# @SUPPORTED_EAPIS: 7 -# @BLURB: common settings and functions for mono and dotnet related packages -# @DEAD -# @DESCRIPTION: -# The mono eclass contains common environment settings that are useful for -# dotnet packages. Currently, it provides no functions, just exports -# MONO_SHARED_DIR and sets LC_ALL in order to prevent errors during compilation -# of dotnet packages. - -case ${EAPI:-0} in - 7) ;; - *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; -esac - -if [[ -z ${_MONO_ECLASS} ]] ; then -_MONO_ECLASS=1 - -inherit multilib - -# >=mono-0.92 versions using mcs -pkg:foo-sharp require shared memory, so we set the -# shared dir to ${T} so that ${T}/.wapi can be used during the install process. -export MONO_SHARED_DIR="${T}" - -# Building mono, nant and many other dotnet packages is known to fail if LC_ALL -# variable is not set to C. To prevent this all mono related packages will be -# build with LC_ALL=C (see bugs #146424, #149817) -export LC_ALL=C - -# Monodevelop-using applications need this to be set or they will try to create config -# files in the user's ~ dir. - -export XDG_CONFIG_HOME="${T}" - -# Fix bug 83020: -# "Access Violations Arise When Emerging Mono-Related Packages with MONO_AOT_CACHE" - -unset MONO_AOT_CACHE - -egacinstall() { - gacutil -i "${1}" \ - -root "${ED}"/usr/$(get_libdir) \ - -gacdir /usr/$(get_libdir) \ - -package ${2:-${GACPN:-${PN}}} \ - || die "installing ${1} into the Global Assembly Cache failed" -} - -mono_multilib_comply() { - local dir finddirs=() mv_command=${mv_command:-mv} - if [[ -d "${ED}/usr/lib" && "$(get_libdir)" != "lib" ]] - then - if ! [[ -d "${ED}"/usr/"$(get_libdir)" ]] - then - mkdir "${ED}"/usr/"$(get_libdir)" || die "Couldn't mkdir ${ED}/usr/$(get_libdir)" - fi - ${mv_command} "${ED}"/usr/lib/* "${ED}"/usr/"$(get_libdir)"/ || die "Moving files into correct libdir failed" - rm -rf "${ED}"/usr/lib - for dir in "${ED}"/usr/"$(get_libdir)"/pkgconfig "${ED}"/usr/share/pkgconfig - do - - if [[ -d "${dir}" && "$(find "${dir}" -name '*.pc')" != "" ]] - then - pushd "${dir}" &> /dev/null - sed -i -r -e 's:/(lib)([^a-zA-Z0-9]|$):/'"$(get_libdir)"'\2:g' \ - *.pc \ - || die "Sedding some sense into pkgconfig files failed." - popd "${dir}" &> /dev/null - fi - done - if [[ -d "${ED}/usr/bin" ]] - then - for exe in "${ED}/usr/bin"/* - do - if [[ "$(file -S "${exe}")" == *"shell script text"* ]] - then - sed -r -i -e ":/lib(/|$): s:/lib(/|$):/$(get_libdir)\1:" \ - "${exe}" || die "Sedding some sense into ${exe} failed" - fi - done - fi - - fi -} - -fi diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass index 89bca88b9e6b..41fccb7c4a07 100644 --- a/eclass/rust-toolchain.eclass +++ b/eclass/rust-toolchain.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: rust-toolchain.eclass @@ -73,6 +73,7 @@ rust_abi() { rust_arch_uri() { if [ -n "$3" ]; then echo "${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz -> ${3}-${1}.tar.xz" + echo "verify-sig? ( ${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz.asc -> ${3}-${1}.tar.xz.asc )" else echo "${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz" echo "verify-sig? ( ${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz.asc )" @@ -80,7 +81,7 @@ rust_arch_uri() { } # @FUNCTION: rust_all_arch_uris -# @USAGE: <base-uri> [alt-distfile-basename] +# @USAGE: [alt-distfile-basename] [rust_arch_uri-rename-param] # @DESCRIPTION: # Outputs the URIs for SRC_URI to help fetch dependencies, using a base URI # provided as an argument. Optionally allows for distfile renaming via a specified @@ -91,51 +92,31 @@ rust_arch_uri() { # rust_all_arch_uris() { + local alt_basename="$1" + local rename_param="$2" + echo " - abi_x86_32? ( elibc_glibc? ( $(rust_arch_uri i686-unknown-linux-gnu "$@") ) ) + abi_x86_32? ( elibc_glibc? ( $(rust_arch_uri i686-unknown-linux-gnu "${alt_basename}" "${rename_param}") ) ) abi_x86_64? ( - elibc_glibc? ( $(rust_arch_uri x86_64-unknown-linux-gnu "$@") ) - elibc_musl? ( $(rust_arch_uri x86_64-unknown-linux-musl "$@") ) + elibc_glibc? ( $(rust_arch_uri x86_64-unknown-linux-gnu "${alt_basename}" "${rename_param}") ) + elibc_musl? ( $(rust_arch_uri x86_64-unknown-linux-musl "${alt_basename}" "${rename_param}") ) ) arm? ( elibc_glibc? ( - $(rust_arch_uri arm-unknown-linux-gnueabi "$@") - $(rust_arch_uri arm-unknown-linux-gnueabihf "$@") - $(rust_arch_uri armv7-unknown-linux-gnueabihf "$@") + $(rust_arch_uri arm-unknown-linux-gnueabi "${alt_basename}" "${rename_param}") + $(rust_arch_uri arm-unknown-linux-gnueabihf "${alt_basename}" "${rename_param}") + $(rust_arch_uri armv7-unknown-linux-gnueabihf "${alt_basename}" "${rename_param}") ) ) arm64? ( - elibc_glibc? ( $(rust_arch_uri aarch64-unknown-linux-gnu "$@") ) - elibc_musl? ( $(rust_arch_uri aarch64-unknown-linux-musl "$@") ) + elibc_glibc? ( $(rust_arch_uri aarch64-unknown-linux-gnu "${alt_basename}" "${rename_param}") ) + elibc_musl? ( $(rust_arch_uri aarch64-unknown-linux-musl "${alt_basename}" "${rename_param}") ) ) - ppc? ( elibc_glibc? ( $(rust_arch_uri powerpc-unknown-linux-gnu "$@") ) ) + ppc? ( elibc_glibc? ( $(rust_arch_uri powerpc-unknown-linux-gnu "${alt_basename}" "${rename_param}") ) ) ppc64? ( - big-endian? ( elibc_glibc? ( $(rust_arch_uri powerpc64-unknown-linux-gnu "$@") ) ) - !big-endian? ( elibc_glibc? ( $(rust_arch_uri powerpc64le-unknown-linux-gnu "$@") ) ) + big-endian? ( elibc_glibc? ( $(rust_arch_uri powerpc64-unknown-linux-gnu "${alt_basename}" "${rename_param}") ) ) + !big-endian? ( elibc_glibc? ( $(rust_arch_uri powerpc64le-unknown-linux-gnu "${alt_basename}" "${rename_param}") ) ) ) - riscv? ( elibc_glibc? ( $(rust_arch_uri riscv64gc-unknown-linux-gnu "$@") ) ) - s390? ( elibc_glibc? ( $(rust_arch_uri s390x-unknown-linux-gnu "$@") ) ) + riscv? ( elibc_glibc? ( $(rust_arch_uri riscv64gc-unknown-linux-gnu "${alt_basename}" "${rename_param}") ) ) + s390? ( elibc_glibc? ( $(rust_arch_uri s390x-unknown-linux-gnu "${alt_basename}" "${rename_param}") ) ) + loong? ( elibc_glibc? ( $(rust_arch_uri loongarch64-unknown-linux-gnu "${alt_basename}" "${rename_param}") ) ) " - - # Upstream did not gain support for loong until v1.71.0. - # NOTE: Merge this into the block above after every <1.71.0 version is - # gone from tree. - local arg_version="${1##*-}" - arg_version="${arg_version:-$PV}" - if ver_test "${arg_version}" -ge 1.71.0; then - echo "loong? ( elibc_glibc? ( $(rust_arch_uri loongarch64-unknown-linux-gnu "$@") ) )" - fi - - # until https://github.com/rust-lang/rust/pull/113274 is resolved, there - # will not be upstream-built mips artifacts - if ver_test "${arg_version}" -lt 1.72.0; then - echo "mips? ( - abi_mips_o32? ( - big-endian? ( $(rust_arch_uri mips-unknown-linux-gnu "$@") ) - !big-endian? ( $(rust_arch_uri mipsel-unknown-linux-gnu "$@") ) - ) - abi_mips_n64? ( - big-endian? ( $(rust_arch_uri mips64-unknown-linux-gnuabi64 "$@") ) - !big-endian? ( $(rust_arch_uri mips64el-unknown-linux-gnuabi64 "$@") ) - ) - )" - fi } diff --git a/eclass/rust.eclass b/eclass/rust.eclass index 46b441ba6701..9ead9d005706 100644 --- a/eclass/rust.eclass +++ b/eclass/rust.eclass @@ -67,6 +67,9 @@ fi # @DESCRIPTION: # Definitive list of Rust slots and the associated LLVM slot, newest first. declare -A -g -r _RUST_LLVM_MAP=( + ["9999"]=20 + ["1.86.0"]=19 + ["1.85.0"]=19 ["1.84.1"]=19 ["1.84.0"]=19 ["1.83.0"]=19 @@ -89,6 +92,9 @@ declare -A -g -r _RUST_LLVM_MAP=( # While _RUST_LLVM_MAP stores useful info about the relationship between Rust and LLVM slots, # this array is used to store the Rust slots in a more convenient order for iteration. declare -a -g -r _RUST_SLOTS_ORDERED=( + "9999" + "1.86.0" + "1.85.0" "1.84.1" "1.84.0" "1.83.0" |