mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-29 14:31:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

eclass/toolchain: Sync with Gentoo

Browse Source 
It's from Gentoo commit 2f8bd00507759447a513a934e440dc2fb49afceb.
This commit is contained in:
Flatcar Buildbot 2023-06-05 07:14:03 +00:00
parent 7f95dbd880
commit a2711bc31e
1 changed files with 11 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -426,15 +426,17 @@ fi
# Set the source directory depending on whether we're using # Set the source directory depending on whether we're using
# a live git tree, snapshot, or release tarball. # a live git tree, snapshot, or release tarball.
if [[ ${TOOLCHAIN_SET_S} == yes ]] ; then if [[ ${TOOLCHAIN_SET_S} == yes ]] ; then
S=$( s_path=
if tc_is_live ; then if tc_is_live ; then
echo ${EGIT_CHECKOUT_DIR} s_path=${EGIT_CHECKOUT_DIR}
elif [[ -n ${SNAPSHOT} ]] ; then elif [[ -n ${SNAPSHOT} ]] ; then
echo ${WORKDIR}/gcc-${SNAPSHOT} s_path=${WORKDIR}/gcc-${SNAPSHOT}
else else
echo ${WORKDIR}/gcc-${GCC_RELEASE_VER} s_path=${WORKDIR}/gcc-${GCC_RELEASE_VER}
fi fi
)
S="${s_path}"
unset s_path
fi fi
gentoo_urls() { gentoo_urls() {
@ -526,13 +528,6 @@ gentoo_urls() {
# The resulting filename of this tarball will be: # The resulting filename of this tarball will be:
# gcc-${SPECS_GCC_VER:-${GCC_RELEASE_VER}}-specs-${SPECS_VER}.tar.xz # gcc-${SPECS_GCC_VER:-${GCC_RELEASE_VER}}-specs-${SPECS_VER}.tar.xz
# #
# CYGWINPORTS_GITREV
# If set, this variable signals that we should apply additional patches
# maintained by upstream Cygwin developers at github/cygwinports/gcc,
# using the specified git commit id there. The list of patches to
# apply is extracted from gcc.cygport, maintained there as well.
# This is done for compilers running on Cygwin, not for cross compilers
# with a Cygwin target.
get_gcc_src_uri() { get_gcc_src_uri() {
export PATCH_GCC_VER=${PATCH_GCC_VER:-${GCC_RELEASE_VER}} export PATCH_GCC_VER=${PATCH_GCC_VER:-${GCC_RELEASE_VER}}
export MUSL_GCC_VER=${MUSL_GCC_VER:-${PATCH_GCC_VER}} export MUSL_GCC_VER=${MUSL_GCC_VER:-${PATCH_GCC_VER}}
@ -584,11 +579,6 @@ get_gcc_src_uri() {
fi fi
fi fi
# Cygwin patches from https://github.com/cygwinports/gcc
[[ -n ${CYGWINPORTS_GITREV} ]] && \
GCC_SRC_URI+=" elibc_Cygwin? ( https://github.com/cygwinports/gcc/archive/${CYGWINPORTS_GITREV}.tar.gz
-> gcc-cygwinports-${CYGWINPORTS_GITREV}.tar.gz )"
echo "${GCC_SRC_URI}" echo "${GCC_SRC_URI}"
} }
@ -675,7 +665,6 @@ toolchain_src_prepare() {
do_gcc_gentoo_patches do_gcc_gentoo_patches
do_gcc_PIE_patches do_gcc_PIE_patches
do_gcc_CYGWINPORTS_patches
if tc_is_live ; then if tc_is_live ; then
BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, commit ${EGIT_VERSION}" BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, commit ${EGIT_VERSION}"
@ -801,23 +790,6 @@ do_gcc_PIE_patches() {
BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, pie-${PIE_VER}" BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, pie-${PIE_VER}"
} }
do_gcc_CYGWINPORTS_patches() {
[[ -n ${CYGWINPORTS_GITREV} ]] || return 0
use elibc_Cygwin || return 0
local p d="${WORKDIR}/gcc-${CYGWINPORTS_GITREV}"
# readarray -t is available since bash-4.4 only, bug #690686
local patches=( $(
for p in $(
sed -e '1,/PATCH_URI="/d;/"/,$d' < "${d}"/gcc.cygport
); do
echo "${d}/${p}"
done
) )
einfo "Applying cygwin port patches ..."
eapply -- "${patches[@]}"
}
# configure to build with the hardened GCC specs as the default # configure to build with the hardened GCC specs as the default
make_gcc_hard() { make_gcc_hard() {
local gcc_hard_flags="" local gcc_hard_flags=""
@ -1197,9 +1169,6 @@ toolchain_src_configure() {
*-musl*) *-musl*)
needed_libc=musl needed_libc=musl
;; ;;
*-cygwin)
needed_libc=cygwin
;;
x86_64-*-mingw*|*-w64-mingw*) x86_64-*-mingw*|*-w64-mingw*)
needed_libc=mingw64-runtime needed_libc=mingw64-runtime
;; ;;