commit: c41f3cee36633d1e425d611ed63e3f35e0aaaeb4 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sat Oct 19 11:42:41 2019 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sat Oct 19 21:20:30 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c41f3cee
toolchain.eclass: drop PIE patch support for <gcc-4.2 ::gentoo and ::toolchain don't have any ebuilds using PIE patchset. If someone really needs to resurrect these old patches it's easier to reshuffle the patchset itself. Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> eclass/toolchain.eclass | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 0c0378d9a7e..ec196db072d 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -649,23 +649,9 @@ do_gcc_PIE_patches() { want_pie || return 0 use vanilla && return 0 - if tc_version_is_at_least 4.3.2 ; then - guess_patch_type_in_dir "${WORKDIR}"/piepatch/ - EPATCH_MULTI_MSG="Applying pie patches ..." \ - epatch "${WORKDIR}"/piepatch/ - else - guess_patch_type_in_dir "${WORKDIR}"/piepatch/upstream - - # corrects startfile/endfile selection and shared/static/pie flag usage - EPATCH_MULTI_MSG="Applying upstream pie patches ..." \ - epatch "${WORKDIR}"/piepatch/upstream - # adds non-default pie support (rs6000) - EPATCH_MULTI_MSG="Applying non-default pie patches ..." \ - epatch "${WORKDIR}"/piepatch/nondef - # adds default pie support (rs6000 too) if DEFAULT_PIE[_SSP] is defined - EPATCH_MULTI_MSG="Applying default pie patches ..." \ - epatch "${WORKDIR}"/piepatch/def - fi + guess_patch_type_in_dir "${WORKDIR}"/piepatch/ + EPATCH_MULTI_MSG="Applying pie patches ..." \ + epatch "${WORKDIR}"/piepatch/ BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, pie-${PIE_VER}" }