commit: d110c9df603fb2fdef6ea82c44fe89adfb7bc789 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sun Sep 6 13:25:45 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sun Sep 6 13:26:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d110c9df
sys-devel/gcc: skip upstreamed patches from gcc-10 Reported-by: Helmut Jarausch Closes: https://bugs.gentoo.org/740682 Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> sys-devel/gcc/Manifest | 1 - sys-devel/gcc/gcc-10.2.1_pre9999.ebuild | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 634fd09a08b..e67044c2378 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -1,5 +1,4 @@ DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e -DIST gcc-10.2.0-patches-1.tar.bz2 14865 BLAKE2B 055ceac96a308081f395f12a970d6f5264d5dfac6defabb6baefafd6d584c03f2f968e0720448af5b6955e209c5d2220bc45854088347d7b438de9d716072804 SHA512 3583f51b2b80e1dab5ebda174c83054375a0c6601c6fca54a6991bbbbe5f335e30ee846fae57c0096ce28b23715fbfee8b560727c77cac263e83f44f03c6eda4 DIST gcc-10.2.0-patches-2.tar.bz2 17701 BLAKE2B bed0cf2dcb6b2e35dbd86c43db617cfa0a0973b3d55bd6e12baf9e6495afd0fec855fefd223172c23f11449769996c18359abacfac36f62681310c861d5d2850 SHA512 6ebf5875ecc9f10dea67d4793fcc47178ddd6abe8959fc0390c6ff967fba7318013b4bf251abf451999b86697e97390c8698685b12086956c8e6bc2e97708bc9 DIST gcc-10.2.0.tar.xz 75004144 BLAKE2B 1d79397330354e61439283cac96a109bf78ffc726265442e6d3ec131f107589ab7349d6612836edd8c8512f7bcc1d901a65a0d5d925d28a5bf3ef5cc3f9787ee SHA512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e DIST gcc-11.0.0-patches-4.tar.bz2 12829 BLAKE2B d0e12c09268e096390c3841e466e35bcd66a735536287c80d9713335a65a82c55ade728b487ed549ba1bfa60c9dd95bcad5ae27a86619f2a7c3236fdf457b41b SHA512 010b90b63ac142efeabc1c51287727f472a469a7a25e0576f5bdc380206cf500ae78060da3e97fa46c3fa7288e6cb1b4a2b7b78d7c8704b6db05a23be902e649 diff --git a/sys-devel/gcc/gcc-10.2.1_pre9999.ebuild b/sys-devel/gcc/gcc-10.2.1_pre9999.ebuild index 16a7ee80503..5a5beeba49e 100644 --- a/sys-devel/gcc/gcc-10.2.1_pre9999.ebuild +++ b/sys-devel/gcc/gcc-10.2.1_pre9999.ebuild @@ -4,7 +4,7 @@ EAPI="7" PATCH_GCC_VER="10.2.0" # reuse subset of patches for latest for live ebuilds gcc -PATCH_VER="1" +PATCH_VER="2" inherit toolchain @@ -13,3 +13,18 @@ inherit toolchain RDEPEND="" BDEPEND="${CATEGORY}/binutils" + +src_prepare() { + local p upstreamed_patches=( + 32_all_sparc_pie_TEXTREL.patch + 33_all_lto-O0-mix-ICE-ipa-PR96291.patch + 35_all_ipa-fix-bit-CP.patch + 36_all_ipa-fix-bit-CP-p2.patch + ) + + for p in "${upstreamed_patches[@]}"; do + rm -v "${WORKDIR}/patch/$p" || die + done + + toolchain_src_prepare +}
