[gentoo-commits] repo/gentoo:master commit in: eclass/

[Sam James]

commit:     cfd6bbfe4c62cb4667bd43062c15831c3496a7ba
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  2 23:39:18 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun  3 00:48:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfd6bbfe

toolchain.eclass: drop legacy cygwin cruft

Cygwin supported already dropped from Prefix and the rest of the tree.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/toolchain.eclass | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 87da1fba73c0..a0b647a5c67a 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -526,13 +526,6 @@ gentoo_urls() {
 #                      The resulting filename of this tarball will be:
 #                      
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() {
        export PATCH_GCC_VER=${PATCH_GCC_VER:-${GCC_RELEASE_VER}}
        export MUSL_GCC_VER=${MUSL_GCC_VER:-${PATCH_GCC_VER}}
@@ -584,11 +577,6 @@ get_gcc_src_uri() {
                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}"
 }
 
@@ -675,7 +663,6 @@ toolchain_src_prepare() {
 
        do_gcc_gentoo_patches
        do_gcc_PIE_patches
-       do_gcc_CYGWINPORTS_patches
 
        if tc_is_live ; then
                BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, commit 
${EGIT_VERSION}"
@@ -801,23 +788,6 @@ do_gcc_PIE_patches() {
        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
 make_gcc_hard() {
        local gcc_hard_flags=""
@@ -1197,9 +1167,6 @@ toolchain_src_configure() {
                        *-musl*)
                                needed_libc=musl
                                ;;
-                       *-cygwin)
-                               needed_libc=cygwin
-                               ;;
                        x86_64-*-mingw*|*-w64-mingw*)
                                needed_libc=mingw64-runtime
                                ;;