mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-15 08:56:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

eclass/toolchain: Sync with Gentoo

Browse Source 
It's from Gentoo commit b2534ce5456f3d70a25035f573eb8747d7341d3d.
This commit is contained in:
Flatcar Buildbot 2022-10-18 15:57:45 +00:00
parent a73204d43f
commit 9c78b78dce
1 changed files with 57 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass vendored
View File

@ -6,6 +6,10 @@
# Toolchain Ninjas <toolchain@gentoo.org> # Toolchain Ninjas <toolchain@gentoo.org>
# @SUPPORTED_EAPIS: 7 8 # @SUPPORTED_EAPIS: 7 8
# @BLURB: Common code for sys-devel/gcc ebuilds # @BLURB: Common code for sys-devel/gcc ebuilds
# @DESCRIPTION:
# Common code for sys-devel/gcc ebuilds (and occasionally GCC forks, like
# GNAT for Ada). If not building GCC itself, please use toolchain-funcs.eclass
# instead.
case ${EAPI} in case ${EAPI} in
7) inherit eutils ;; 7) inherit eutils ;;
@ -57,6 +61,7 @@ is_crosscompile() {
[[ ${CHOST} != ${CTARGET} ]] [[ ${CHOST} != ${CTARGET} ]]
} }
# @FUNCTION: tc_version_is_at_least # @FUNCTION: tc_version_is_at_least
# @USAGE: ver1 [ver2] # @USAGE: ver1 [ver2]
# @DESCRIPTION: # @DESCRIPTION:
@ -138,6 +143,32 @@ GCCMINOR=$(ver_cut 2 ${GCC_PV})
# GCC micro version. # GCC micro version.
GCCMICRO=$(ver_cut 3 ${GCC_PV}) GCCMICRO=$(ver_cut 3 ${GCC_PV})
tc_use_major_version_only() {
local use_major_version_only=0
if ! tc_version_is_at_least 10 ; then
return 1
fi
if [[ ${GCCMAJOR} -eq 10 ]] && ver_test ${PV} -ge 10.4.1_p20220929 ; then
use_major_version_only=1
elif [[ ${GCCMAJOR} -eq 11 ]] && ver_test ${PV} -ge 11.3.1_p20220930 ; then
use_major_version_only=1
elif [[ ${GCCMAJOR} -eq 12 ]] && ver_test ${PV} -ge 12.2.1_p20221001 ; then
use_major_version_only=1
elif [[ ${GCCMAJOR} -eq 13 ]] && ver_test ${PV} -ge 13.0.0_pre20221002 ; then
use_major_version_only=1
elif [[ ${GCCMAJOR} -gt 13 ]] ; then
use_major_version_only=1
fi
if [[ ${use_major_version_only} -eq 1 ]] ; then
return 0
fi
return 1
}
# @ECLASS_VARIABLE: GCC_CONFIG_VER # @ECLASS_VARIABLE: GCC_CONFIG_VER
# @INTERNAL # @INTERNAL
# @DESCRIPTION: # @DESCRIPTION:
@ -145,7 +176,11 @@ GCCMICRO=$(ver_cut 3 ${GCC_PV})
# of binary and gcc-config names not directly tied to upstream # of binary and gcc-config names not directly tied to upstream
# versioning. In practice it's hard to untangle from gcc/BASE-VER # versioning. In practice it's hard to untangle from gcc/BASE-VER
# (GCC_RELEASE_VER) value. # (GCC_RELEASE_VER) value.
GCC_CONFIG_VER=${GCC_RELEASE_VER} if tc_use_major_version_only ; then
GCC_CONFIG_VER=${GCCMAJOR}
else
GCC_CONFIG_VER=${GCC_RELEASE_VER}
fi
# Pre-release support. Versioning schema: # Pre-release support. Versioning schema:
# 1.0.0_pre9999: live ebuild # 1.0.0_pre9999: live ebuild
@ -830,7 +865,7 @@ make_gcc_hard() {
# Most other distros use the logic (including mainline gcc): # Most other distros use the logic (including mainline gcc):
# lib - 32bit binaries (x86) # lib - 32bit binaries (x86)
# lib64 - 64bit binaries (x86_64) # lib64 - 64bit binaries (x86_64)
# Over time, Gentoo is migrating to the latter form. # Over time, Gentoo is migrating to the latter form (17.1 profiles).
# #
# Unfortunately, due to distros picking the lib32 behavior, newer gcc # Unfortunately, due to distros picking the lib32 behavior, newer gcc
# versions will dynamically detect whether to use lib or lib32 for its # versions will dynamically detect whether to use lib or lib32 for its
@ -1006,6 +1041,10 @@ toolchain_src_configure() {
--with-pkgversion="${BRANDING_GCC_PKGVERSION}" --with-pkgversion="${BRANDING_GCC_PKGVERSION}"
) )
if tc_use_major_version_only ; then
confgcc+=( --with-gcc-major-version-only )
fi
# If we want hardened support with the newer PIE patchset for >=gcc 4.4 # If we want hardened support with the newer PIE patchset for >=gcc 4.4
if tc_version_is_at_least 4.4 && want_minispecs && in_iuse hardened ; then if tc_version_is_at_least 4.4 && want_minispecs && in_iuse hardened ; then
confgcc+=( $(use_enable hardened esp) ) confgcc+=( $(use_enable hardened esp) )
@ -1975,6 +2014,9 @@ toolchain_src_install() {
fi fi
done done
# Re-enable fixincludes for >= GCC 13
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107128
if [[ ${GCCMAJOR} -lt 13 ]] ; then
# We remove the generated fixincludes, as they can cause things to break # We remove the generated fixincludes, as they can cause things to break
# (ncurses, openssl, etc). We do not prevent them from being built, as # (ncurses, openssl, etc). We do not prevent them from being built, as
# in the following commit which we revert: # in the following commit which we revert:
@ -1985,6 +2027,7 @@ toolchain_src_install() {
grep -q 'It has been auto-edited by fixincludes from' "${x}" \ grep -q 'It has been auto-edited by fixincludes from' "${x}" \
&& rm -f "${x}" && rm -f "${x}"
done < <(find gcc/include*/ -name '*.h') done < <(find gcc/include*/ -name '*.h')
fi
if is_jit ; then if is_jit ; then
# See https://gcc.gnu.org/onlinedocs/gcc-11.3.0/jit/internals/index.html#packaging-notes # See https://gcc.gnu.org/onlinedocs/gcc-11.3.0/jit/internals/index.html#packaging-notes
@ -2713,11 +2756,11 @@ toolchain_death_notice() {
pushd "${WORKDIR}"/build >/dev/null pushd "${WORKDIR}"/build >/dev/null
(echo '' | $(tc-getCC ${CTARGET}) ${CFLAGS} -v -E - 2>&1) > gccinfo.log (echo '' | $(tc-getCC ${CTARGET}) ${CFLAGS} -v -E - 2>&1) > gccinfo.log
[[ -e "${T}"/build.log ]] && cp "${T}"/build.log . [[ -e "${T}"/build.log ]] && cp "${T}"/build.log .
tar jcf "${WORKDIR}"/gcc-build-logs.tar.bz2 \ tar -acf "${WORKDIR}"/gcc-build-logs.tar.xz \
gccinfo.log build.log $(find -name config.log) gccinfo.log build.log $(find -name config.log)
rm gccinfo.log build.log rm gccinfo.log build.log
eerror eerror
eerror "Please include ${WORKDIR}/gcc-build-logs.tar.bz2 in your bug report." eerror "Please include ${WORKDIR}/gcc-build-logs.tar.xz in your bug report."
eerror eerror
popd >/dev/null popd >/dev/null
fi fi