diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 39012 -> 39022 bytes | |||
| -rw-r--r-- | eclass/llvm.org.eclass | 3 | ||||
| -rw-r--r-- | eclass/rust.eclass | 12 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 3 |
4 files changed, 11 insertions, 7 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 79c6d93bec23..69849446f14b 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass index 7325bf75e3bb..22cbeb6c0fc6 100644 --- a/eclass/llvm.org.eclass +++ b/eclass/llvm.org.eclass @@ -72,6 +72,9 @@ if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then _LLVM_SOURCE_TYPE=snapshot case ${PV} in + 20.0.0_pre20241113) + EGIT_COMMIT=c7df10643bda4acdc9a02406a2eee8aa4ced747f + ;; 20.0.0_pre20241106) EGIT_COMMIT=0e907c17214aa3b1a60b66867fea3cc0f0dcbaa0 ;; diff --git a/eclass/rust.eclass b/eclass/rust.eclass index 3a8a93718787..f293e96d7ce8 100644 --- a/eclass/rust.eclass +++ b/eclass/rust.eclass @@ -259,10 +259,10 @@ unset -f _rust_set_globals # and print its version number (i.e. SLOT) and type (source or bin[ary]). # # If -b is specified, the checks are performed relative to BROOT, -# and BROOT-path is returned. +# and BROOT-path is returned. -b is the default. # # If -d is specified, the checks are performed relative to ESYSROOT, -# and ESYSROOT-path is returned. -d is the default. +# and ESYSROOT-path is returned. # # If RUST_M{AX,IN}_SLOT is non-zero, then only Rust versions that # are not newer or older than the specified slot(s) will be considered. @@ -278,7 +278,7 @@ unset -f _rust_set_globals _get_rust_slot() { debug-print-function ${FUNCNAME} "$@" - local hv_switch=-d + local hv_switch=-b while [[ ${1} == -* ]]; do case ${1} in -b|-d) hv_switch="${1}";; @@ -412,7 +412,7 @@ get_rust_prefix() { [[ ${1} == -d ]] && prefix=${ESYSROOT} local slot rust_type - read -r slot rust_type <<< $(_get_rust_slot) + read -r slot rust_type <<< $(_get_rust_slot "$@") get_rust_path "${prefix}" "${slot}" "${rust_type}" } @@ -451,9 +451,9 @@ rust_pkg_setup() { debug-print-function ${FUNCNAME} "$@" if [[ ${MERGE_TYPE} != binary ]]; then - read -r RUST_SLOT RUST_TYPE <<< $(_get_rust_slot) + read -r RUST_SLOT RUST_TYPE <<< $(_get_rust_slot -b) rust_prepend_path "${RUST_SLOT}" "${RUST_TYPE}" - local prefix=$(get_rust_prefix) + local prefix=$(get_rust_path "${BROOT}" "${RUST_SLOT}" "${RUST_TYPE}") CARGO="${prefix}bin/cargo" RUSTC="${prefix}bin/rustc" export CARGO RUSTC diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 1f043de0b548..8fe3cde2a69f 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1065,7 +1065,7 @@ toolchain_src_configure() { downgrade_arch_flags gcc_do_filter_flags - if tc_version_is_at_least 14.2.1_p20241026 ${PV}; then + if [[ ${PN} != kgcc64 && ${PN} != gcc-* ]] && tc_version_is_at_least 14.2.1_p20241026 ${PV}; then append-cppflags "-D_GENTOO_TIME64_FORCE=$(usex time64 1 0)" fi @@ -1588,6 +1588,7 @@ toolchain_src_configure() { enable_cet_for 'x86_64' 'gnu' 'cet' enable_cet_for 'aarch64' 'gnu' 'standard-branch-protection' + [[ ${CTARGET} == i[34567]86-* ]] && confgcc+=( --disable-cet ) fi if in_iuse systemtap ; then |