commit: 9eab5244a2b42dba2fac3ecb7be347b841c2ab15 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jun 2 06:27:01 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jun 2 07:15:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eab5244
sys-devel/gcc: update CET patch for 12 Let's switch to the Ubuntu-style spec changing given that the old approach was fragile and could fall over w/ bootstrap (at least w/ USE="pgo lto jit"). Didn't seem to happen with different combinations though. Bug: https://bugs.gentoo.org/822036 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-devel/gcc/Manifest | 1 + ....9999.ebuild => gcc-12.1.1_p20220528-r1.ebuild} | 27 +++------------------- sys-devel/gcc/gcc-12.2.9999.ebuild | 2 +- 3 files changed, 5 insertions(+), 25 deletions(-) diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 28e536cbfbed..375f1a7fbff0 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -21,6 +21,7 @@ DIST gcc-12.0.0-musl-patches-4.tar.xz 4456 BLAKE2B 80ae755b52c31d57eb737b3ec5e70 DIST gcc-12.0.0-patches-5.tar.xz 9820 BLAKE2B cdebb6fa59e594f95cc4b028d329c0fed3ffa1731a4ca1a2954b7760f4a674e773cfe5888fb2c63a619d5d80ec464d98a94870bfe2e3ea34370afce7f67526bb SHA512 a9c27b0188fd842e88d6a831cdf1f9c6d0cada4ec260b5f7e67f3d8fe0f439fb0d2c82469de9fecebd657043babf3e63a24ee53776be2617bb90e1d3dd3f521e DIST gcc-12.1.0-musl-patches-4.tar.xz 4448 BLAKE2B ddad7bccea7474a0552e069df25e66b4af68470da655aaf7669c2ceca7d0588cebb171e8a949c8935eeadff23af4d3de41d44245c06d48044cfc1d1fadc6540a SHA512 bb3b9e4a81efd2d0ceb405220a9c15453d780d8bc01ed5ebf4837a318e0f8ad8cc36d6ad3f2eed5051bb6dc82f223d8b61321b8f602890a770eefd69c0c144b9 DIST gcc-12.1.0-patches-6.tar.xz 10264 BLAKE2B 8ae3f1d0a943551717ea2f5a04253728c97bc3e0583028d6213a030864591b8cc7942e4e1782e7114b9482f9406309deba1d140130d08bbe8bfd2d78581274a1 SHA512 4b20a02034a7847965b451167e201bab31d666e9d0a452a0036076f540c8e4ad8b905fff99e47ea07e074052cf2e52fe022b423d182b73b7ad7f085d21696060 +DIST gcc-12.1.0-patches-7.tar.xz 11584 BLAKE2B 4487726f8225d6bb2fde91fce8343c34ebece8cca08b258115a55b0f0c594e3a205efe26738c2b06cb8c6ea9d13b451514e073bb3a94d664a56120d9826515df SHA512 4882754d2f55c8144a5af4bcfbc1ee7802f08fc5acca96151cc6323a98e94b9246a69e067bcbf92dcdb8021499b8e1197cd7bd682876aca3e6f1f63a405c1dae DIST gcc-12.1.0.tar.xz 82701928 BLAKE2B dca5df8fea680dbeda721742cce5c97de7eb4be490a32a158e06b88e2b9dd092150b7cfe490bb69e48e2f75d8bba231c8a54cd46b48ddcdc01bf9553ab57019d SHA512 2121d295292814a6761edf1fba08c5f633ebe16f52b80e7b73a91050e71e1d2ed98bf17eebad263e191879561c02b48906c53faa4c4670c486a26fc75df23900 DIST gcc-8.5.0-patches-2.tar.bz2 16921 BLAKE2B 619a47f74edf05fa01c9de59d0ff7abb027a01cf0bdec91ac41046166192f4eae561684136c4a6a5e077f64754bb5b0710905129f31b0def21d88f92e6bba7fb SHA512 b6095d4570895e2c4dd58fed5756194aea27391b813e5e2de42b2749cb318c4bea2087eb0ff92c70e7f98ae4482c49d476db57be83d7beb19fd462aa61714ab2 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12 SHA512 92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8 diff --git a/sys-devel/gcc/gcc-12.2.9999.ebuild b/sys-devel/gcc/gcc-12.1.1_p20220528-r1.ebuild similarity index 52% copy from sys-devel/gcc/gcc-12.2.9999.ebuild copy to sys-devel/gcc/gcc-12.1.1_p20220528-r1.ebuild index 99622738e51d..7eed27944c85 100644 --- a/sys-devel/gcc/gcc-12.2.9999.ebuild +++ b/sys-devel/gcc/gcc-12.1.1_p20220528-r1.ebuild @@ -3,29 +3,15 @@ EAPI=8 -PATCH_VER="6" +PATCH_VER="7" PATCH_GCC_VER="12.1.0" MUSL_VER="4" MUSL_GCC_VER="12.1.0" -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - if [[ ${MY_PV_2} == 0 ]] ; then - MY_PV_2=0 - else - MY_PV_2=$(($(ver_cut 2) - 1)) - fi - - # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) -fi - inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) -# Don't keyword live ebuilds -#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~loong" # Technically only if USE=hardened *too* right now, but no point in complicating it further. # If GCC is enabling CET by default, we need glibc to be built with support for it. @@ -35,13 +21,6 @@ DEPEND="${RDEPEND}" BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" src_prepare() { - local p upstreamed_patches=( - # add them here - ) - for p in "${upstreamed_patches[@]}"; do - rm -v "${WORKDIR}/patch/${p}" || die - done - toolchain_src_prepare eapply_user diff --git a/sys-devel/gcc/gcc-12.2.9999.ebuild b/sys-devel/gcc/gcc-12.2.9999.ebuild index 99622738e51d..e3d8d3c19867 100644 --- a/sys-devel/gcc/gcc-12.2.9999.ebuild +++ b/sys-devel/gcc/gcc-12.2.9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PATCH_VER="6" +PATCH_VER="7" PATCH_GCC_VER="12.1.0" MUSL_VER="4" MUSL_GCC_VER="12.1.0"
