commit: 016184c289f2cc6c6ade496a700a12f135fbae07 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jan 23 00:25:35 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jan 23 00:42:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=016184c2
sys-devel/gcc: backport CET fix for 11; further make jobserver related fixes for all - jobserver: Led to crashes during build in some cases. Note that this is a bug in the driver so could easily happen when using GCC to build other things too. - CET: See https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=15daf0510a5fab17cd556261d688a6618391a0c1 for details, but went for a more conservative approach for GCC 11. Bug: https://bugs.gentoo.org/822036 Closes: https://bugs.gentoo.org/885501 Closes: https://bugs.gentoo.org/891655 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-devel/gcc/Manifest | 4 +++- ...30119.ebuild => gcc-10.4.1_p20230119-r1.ebuild} | 8 +++---- ...30120.ebuild => gcc-11.3.1_p20230120-r1.ebuild} | 8 +++---- ...30120.ebuild => gcc-12.2.1_p20230121-r1.ebuild} | 28 +++++++++++----------- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 45aa2139e49a..be93b6487175 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -7,6 +7,7 @@ DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529 DIST gcc-10.5.0-musl-patches-1.tar.xz 3816 BLAKE2B 5995f934a40665d877342853fde8b414eed8770c72e6b11b295b7e7b3c9d38d7407dff63b5751f4449f6fa842c02e87f156cc868e7436a8313f7c8514242d255 SHA512 b93cc54cd7b78fdc487df7c449b03bbfd10094e45f3f8eef20cd69f27a68a14817fe662a2ec119b384eea2dad0491b70f838d010457e386700030b76457afad6 DIST gcc-10.5.0-patches-1.tar.xz 17180 BLAKE2B d8ecc7cc15fa1ab420fa9eff11173a1d5544b369720e8c54fc59375e591ebd0a429b7e81a2a3df86bd2eaf19e4b8148bf2e1b0c8410de3944d4801ce412016b2 SHA512 5855aa23ee0b262c20a1b6fd2d4a947180c079dc00e0fa675043edceee0c822eec0dc752f5fcb281b70c04e50c6fcaf6c5d5160ab15d3f0c51fa030eb2d79d26 DIST gcc-10.5.0-patches-3.tar.xz 17292 BLAKE2B 403b3955756c060fa00cdc55c29cdad58cf0ce449af7a75aabf4ddecc9043cffe5f1d6fe77bec00a59de2040e207fabb390f9c603748926821d189be53f4000d SHA512 f5a192f42222d02ab765e8b284dfbd999e69db8a7d6a2e5f1f378a16ba3f0b26f35bbad3b3a9e6e9e30c6734b76d8b69d80b802593cbe4d671f14cc16db30c8e +DIST gcc-10.5.0-patches-4.tar.xz 17880 BLAKE2B f368b741fd42199c85b770ec45a5232d27295cf7796163251f24fa963f2264c473e161bb34e66b43c4b227e41859d540a66331111392478b280b289d359806c6 SHA512 94f7fbd1b4672f0378c85ac3a96f7954cd22bd7cc1013c32519bbe1cae0ebb5183e14469c61dfc9d931b8d1c261f2ead1c4b47278104d1b5189a0c787aabc40e DIST gcc-11-20221209.tar.xz 76240768 BLAKE2B 3be0f1ece4473bbbf10f7242102f330a6e246c8481da5bd32620dcb15d2acd008bad60d2576a301f03e444e3d93a3c72d5184740c6fb3de2bc05e1863b68a0bc SHA512 33d9581d434c012526eb4d49a4453cf77c57b459fd43f84e49bc764745e0772939eac007e119269f4f1989755df8678613732a84474c691b0c2452237c5b38a3 DIST gcc-11-20221223.tar.xz 76237128 BLAKE2B 4d50d3a296bae501dd4287ca7c877304a60b1a6d444b96598ff2e018f4cf540896c675c11a99cc127acfbe7e3af38d603f6b80b7049d9e525420eaee7c0f81e4 SHA512 efbb26ce3b8a5ffcc36ad84f797b638c1d8d0a1fe61e3d9bd984c0dbce0a887d1384f8644d71f4b25b22ae2c67fedcbc4282780a2b834a47a318ed558fd9e0ed DIST gcc-11-20230120.tar.xz 76201244 BLAKE2B 07bc819dad3e2ee3747f09f43fd73a4263f06274362728174b32d9ead52ea95c25ea6a192397378b9b4c4f958285d97488d28e425c26129d23f143b1a8668fbc SHA512 81f71aeb706b4ccb89e2af5201770fd72cc3190b9b5eac0b5a25a522626b9c4015a2e5d13e4bd1360ac0f7f1be27df51fc530c15ce3c3d782f39f34d5c58803e @@ -17,12 +18,13 @@ DIST gcc-11.4.0-musl-patches-0.tar.xz 3844 BLAKE2B f3f1be6718e3cf08e553a1a2319a8 DIST gcc-11.4.0-musl-patches-1.tar.xz 4320 BLAKE2B 9f59aef44243b6d63bd9c4639b413523e74784dc0da931a9f1be75d2091f7e99c530b32b567315972a88816d6b30d2c404465a2f28138ba2cc894914d7a123fb SHA512 c174623bf40fb0cab53d1ca82fa7e0b05f0114c61c839e316dfff7678d202b850d4d5011432cf6fa40c54e563e28381e9a9f80667d9428b3f272ba8391c6ac84 DIST gcc-11.4.0-patches-3.tar.xz 15200 BLAKE2B a393df941a2a31164f477d6bc0032e28319e8f0bd87200eb453708f85aa8c0bf5d67e733ee7b75cf6d14743e18cc941cee1b77a8247f8c5683d17a98cbeb280f SHA512 6f6096d95c7c62780d1070097739882393a8df5172c3a5ae811a8d4d1c98a0cd14a34f3f7e95410c8f210aec434330ac3b8876c688faeb130d7bb8fa3333ece9 DIST gcc-11.4.0-patches-5.tar.xz 15136 BLAKE2B 202bc321d1a75a543bcbb54ddd7aae2a6d81764b1ae752e95bbcb7b1e68cbac33e2066a1c935c705fc7cea6603e93a6dcb3041645131a5e76c986242a8613908 SHA512 96ec2dec4e663d739fa7b80e63df32aa6d72c193e124bc93580cc1c0f9b8d3578dee3faf0e765b766cc6bb46136958a4b0e7095962d73b6e2a8066b8be558a5c -DIST gcc-11.4.0-patches-6.tar.xz 14160 BLAKE2B b1c4348fe0ac1fa18f33b4079f81d68d23e6ab4a1ca9fd0a148e21ac7c0c899159fc27e2330635b8d7b6bca1838edb9d8c7b5e4513c21ebc18e2962c97ea88fe SHA512 6c688b01fb07a0f971831ff0ecb795228853e0debb06f7f16b44254136235f4a02b55fb96b72204821a93660e1bb6c52e1b11a161cbb6511358b7f5d1c209cf7 +DIST gcc-11.4.0-patches-7.tar.xz 14416 BLAKE2B 3ebf62cba04cac8830a93a99d11c21347c38891db3a81493a10e02e8b7af0c86389ffbede50672dfe1189a77a67b832f8f97a1d95d43eff11db131a143b1d03d SHA512 41e2ed1ccf6d3631accccdab057877c79c99eb1b3c32f9d35628bca6c633c4f8dadb1d7f93bed2e4d7ff9f36cc9e46ea00f0e57e8af64b2e5f4b3b01285c6da3 DIST gcc-12-20221126.tar.xz 79631864 BLAKE2B 3bb97ef4a1a17ab8b92b431b1f792c11131085a1b523efa08c5b4f995b44bf628be371564813e5affb1f8e2320bb8a9b04532e57b2deeef26b33f517783daa5e SHA512 163e0aa39dc5c24980f84000bd6ccd4b7c24581831b7a4cdbd63e4726be5c2b1933d034ce12c65cf95e4c0ebe1175af7e32facace465bfd7c7c377401350a2df DIST gcc-12-20221231.tar.xz 79647424 BLAKE2B 8e75adb993eedf38059ced571d2df160aa3a11ab855bbbba6be7ea8ad630ec0cdf470e432d6d80b794c1b326aca63cf0b8b673fb9c89330f52e5418e2aab8d43 SHA512 76fc6bd5b1e7711e4f2f7c391bc057a3c64db193af11cd2edb7bde5a638134aaac37012da75b90aea30da04b69565276f377266318471b4d123252cf3e5f5852 DIST gcc-12-20230121.tar.xz 79652428 BLAKE2B f4f0e6474d179454dc56dd05c823fca919a894e9efdc64625bb13045c7bd549a7bab59dfb4052d45d594d4484801ab5b18cf3f3d6277be54eaec24a53abd439c SHA512 b6c2486916418a64fab64c3655329bc18ca93ee4eca240e8779bd6d8280124fcd07b1aa8eff979fd317656646ecdba9353107887338354d8bd2c1f68c1609349 DIST gcc-12.2.0-musl-patches-1.tar.xz 3844 BLAKE2B 004432806696f7d0a32366270ac45695e858abee73a255e44dc6e0a225339e4cad40aab0d51dfe9a55d5aa4b4001f5726064bb2eea3212a0874b2d27e229abd7 SHA512 c354edcd641a9dfaf902a0ff4c44c75065d0cf1c36bbf6c3c35c2e23bff22b8f70bcf4458a5a0ef86371e9f2fafca8a54ca822e35820ff442c9458a2819c3606 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258 +DIST gcc-12.2.0-patches-10.tar.xz 14252 BLAKE2B 99368db982227728a6a9e2b1f694999f041f38db4a3806b6a740c86218735f9b561197bc150423a3caad0b5fd335c95d1aca130a519754423cd44a083e655373 SHA512 f7f0d8185e908926046f579793dba5916dc27392b85bfe50a7e70c213c3ba29479dfdb1b27514765b76bc897c4dbb530680e59c4deca7a245a808ed566120e4c DIST gcc-12.2.0-patches-2.tar.xz 13952 BLAKE2B a9e798911acaf45c3f585f69721130cfbecec016727a50ac0f4767b37a2ab9df39e0828abb07f1e429619cc102808f81af8422fef0265415c287d303d9d97fc0 SHA512 1808a05e98094577099d115ff5f3e136e3fc8f39fbe35c5183fd7775383f94439212e5e4174ab8d0ae8c0874e227ff84a958ffdfa1c99c9a8306a9842d126ef9 DIST gcc-12.2.0-patches-8.tar.xz 14656 BLAKE2B 25f00289699e8e3417c5e4a7d424cdbb140304fb764e8d1fee2e259b4231987c8b53cdbdeba761899a0256b764f7cfd6b4e691fcf44634b59b9dac9ab8a49cdc SHA512 dca2983a72d6c95c3cfe8e1c43195c9aff2a9c5c012851c1b30e51f4384be9b08e761ca589e4941528c89e522d1f11bc6964c8584d7761a889f47e302a3d2b5d DIST gcc-12.2.0-patches-9.tar.xz 13636 BLAKE2B fcbd3dc5adeb7425d028001bd21ede21ae5596a48f4cfbeabed3fb657b27edf19bbe502f0388c284ffc87d03714f9e0ba4bc9c8008814c6362ed56b8165d403b SHA512 09581aba97a18008739d70dc6dbfdacd0c82acce6e175c879b50b81c7575c6e056cd9f2a73e7d6231ea5a6f72c248eca3d818996188ec34cdf7137e9f263fc01 diff --git a/sys-devel/gcc/gcc-10.4.1_p20230119.ebuild b/sys-devel/gcc/gcc-10.4.1_p20230119-r1.ebuild similarity index 87% rename from sys-devel/gcc/gcc-10.4.1_p20230119.ebuild rename to sys-devel/gcc/gcc-10.4.1_p20230119-r1.ebuild index 8cb4ccaa5b91..fcb480f4d2ae 100644 --- a/sys-devel/gcc/gcc-10.4.1_p20230119.ebuild +++ b/sys-devel/gcc/gcc-10.4.1_p20230119-r1.ebuild @@ -7,7 +7,7 @@ TOOLCHAIN_PATCH_SUFFIX="xz" TOOLCHAIN_PATCH_DEV="sam" #TOOLCHAIN_GCC_RC=1 PATCH_GCC_VER="10.5.0" -PATCH_VER="3" +PATCH_VER="4" MUSL_VER="1" MUSL_GCC_VER="10.5.0" @@ -35,9 +35,9 @@ inherit toolchain EGIT_BRANCH=releases/gcc-$(ver_cut 1) # Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -#fi +if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi RDEPEND="" BDEPEND="${CATEGORY}/binutils" diff --git a/sys-devel/gcc/gcc-11.3.1_p20230120.ebuild b/sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild similarity index 85% copy from sys-devel/gcc/gcc-11.3.1_p20230120.ebuild copy to sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild index 0eb8f03a6d5b..0393eb576cf0 100644 --- a/sys-devel/gcc/gcc-11.3.1_p20230120.ebuild +++ b/sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 TOOLCHAIN_PATCH_SUFFIX="xz" TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="6" +PATCH_VER="7" PATCH_GCC_VER="11.4.0" MUSL_VER="1" MUSL_GCC_VER="11.4.0" @@ -27,9 +27,9 @@ inherit toolchain EGIT_BRANCH=releases/gcc-$(ver_cut 1) # Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -#fi +if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi # 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. diff --git a/sys-devel/gcc/gcc-11.3.1_p20230120.ebuild b/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild similarity index 62% rename from sys-devel/gcc/gcc-11.3.1_p20230120.ebuild rename to sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild index 0eb8f03a6d5b..9d920152d84e 100644 --- a/sys-devel/gcc/gcc-11.3.1_p20230120.ebuild +++ b/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild @@ -3,12 +3,11 @@ EAPI=8 -TOOLCHAIN_PATCH_SUFFIX="xz" TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="6" -PATCH_GCC_VER="11.4.0" +PATCH_VER="10" +PATCH_GCC_VER="12.2.0" MUSL_VER="1" -MUSL_GCC_VER="11.4.0" +MUSL_GCC_VER="12.2.0" if [[ $(ver_cut 3) == 9999 ]] ; then MY_PV_2=$(ver_cut 2) @@ -20,16 +19,24 @@ if [[ $(ver_cut 3) == 9999 ]] ; then # e.g. 12.2.9999 -> 12.1.1 TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) +elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then + # Cheesy hack for RCs + MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) + MY_P=${PN}-${MY_PV} + GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"; + TOOLCHAIN_SET_S=no + S="${WORKDIR}"/${MY_P} fi inherit toolchain + # Needs to be after inherit (for now?), bug #830908 EGIT_BRANCH=releases/gcc-$(ver_cut 1) # Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -#fi +if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi # 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. @@ -39,13 +46,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
