[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc/

["Sam James" <sam@gentoo.org>]

commit:     b722939b4023e6de68bc03ddc36c20d0d8d8e39f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 10:43:07 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 10:44:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b722939b

sys-devel/gcc: update musl patchset for others too (not just latest of each)

Easier if we do it for all, given not all kw'd.

Bug: https://bugs.gentoo.org/862831
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/gcc/Manifest                       | 4 ----
 sys-devel/gcc/gcc-10.4.1_p20221208.ebuild    | 2 +-
 sys-devel/gcc/gcc-11.3.1_p20221209.ebuild    | 2 +-
 sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild | 2 +-
 sys-devel/gcc/gcc-12.2.0.ebuild              | 4 ++--
 sys-devel/gcc/gcc-12.2.1_p20221126.ebuild    | 2 +-
 sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild | 2 +-
 7 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 3454ee4382c0..6f18883686cd 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -4,7 +4,6 @@ DIST gcc-10-20230126.tar.xz 72121284 BLAKE2B add27f5cacaf5c36c4c54e2c71f6e60edd0
 DIST gcc-10.4.0-musl-patches-1.tar.xz 3808 BLAKE2B 804d1fcc451dcd03be71240dd498ec2d179869571d44012967c48dccf5a478dd8c55000a964a80fdd5584d739a777dee1c83241cffce514ef002df2572854a67 SHA512 83e4a9c0f7062baf0c606a2bcc56a818494991403d7577dea65f04bbc25bdb786a5889b80d45d80e7f4be07c1aef786802cbfcfafd1a17ec255a2d4e93a77570
 DIST gcc-10.4.0-patches-5.tar.xz 17056 BLAKE2B f336d69a8ad105b8c4a84e8248a5b8a88175d3f1d67d32c6bee1780d252d86947059bd624992e6292610e86c9012f4d901a1a54df0d184dd023d404a0707700e SHA512 aa8fb42f20587f8519e7b06037da4d8f7d386b63e228b239a0445a51df4e401940fcd81482381d966622054aef3e0db06d1def5c74ac3d3dcc9c75c3b966c758
 DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529fc7e120c6bc3a3eb1db5cf938ebde347c1e595a8ff7d4081e79ded6252702d7a1a09648449b7a0783188e434 SHA512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648
-DIST gcc-10.5.0-musl-patches-1.tar.xz 3816 BLAKE2B 5995f934a40665d877342853fde8b414eed8770c72e6b11b295b7e7b3c9d38d7407dff63b5751f4449f6fa842c02e87f156cc868e7436a8313f7c8514242d255 SHA512 b93cc54cd7b78fdc487df7c449b03bbfd10094e45f3f8eef20cd69f27a68a14817fe662a2ec119b384eea2dad0491b70f838d010457e386700030b76457afad6
 DIST gcc-10.5.0-musl-patches-2.tar.xz 3452 BLAKE2B 5387e516d07d81477b3f39b8b3bd986bf861d32cd25dc5481c97bd3620d00c918c5661e86857f66dbf28a655401a53e43417f638c443e44cbfdbf5e950caac4d SHA512 86f2ce31cc4fc4fb5a6043fb527bf822d895e1a6220652024f78a1cbd5a962edb6be8dc5f43c32053e075f39bb2350ea8f14e7d57e0473dd2933a7b44676bde5
 DIST gcc-10.5.0-patches-1.tar.xz 17180 BLAKE2B d8ecc7cc15fa1ab420fa9eff11173a1d5544b369720e8c54fc59375e591ebd0a429b7e81a2a3df86bd2eaf19e4b8148bf2e1b0c8410de3944d4801ce412016b2 SHA512 5855aa23ee0b262c20a1b6fd2d4a947180c079dc00e0fa675043edceee0c822eec0dc752f5fcb281b70c04e50c6fcaf6c5d5160ab15d3f0c51fa030eb2d79d26
 DIST gcc-10.5.0-patches-4.tar.xz 17880 BLAKE2B f368b741fd42199c85b770ec45a5232d27295cf7796163251f24fa963f2264c473e161bb34e66b43c4b227e41859d540a66331111392478b280b289d359806c6 SHA512 94f7fbd1b4672f0378c85ac3a96f7954cd22bd7cc1013c32519bbe1cae0ebb5183e14469c61dfc9d931b8d1c261f2ead1c4b47278104d1b5189a0c787aabc40e
@@ -12,8 +11,6 @@ DIST gcc-10.5.0-patches-5.tar.xz 17324 BLAKE2B e97b471fb6115fd0421be8a6390f7d883
 DIST gcc-11-20221209.tar.xz 76240768 BLAKE2B 3be0f1ece4473bbbf10f7242102f330a6e246c8481da5bd32620dcb15d2acd008bad60d2576a301f03e444e3d93a3c72d5184740c6fb3de2bc05e1863b68a0bc SHA512 33d9581d434c012526eb4d49a4453cf77c57b459fd43f84e49bc764745e0772939eac007e119269f4f1989755df8678613732a84474c691b0c2452237c5b38a3
 DIST gcc-11-20230120.tar.xz 76201244 BLAKE2B 07bc819dad3e2ee3747f09f43fd73a4263f06274362728174b32d9ead52ea95c25ea6a192397378b9b4c4f958285d97488d28e425c26129d23f143b1a8668fbc SHA512 81f71aeb706b4ccb89e2af5201770fd72cc3190b9b5eac0b5a25a522626b9c4015a2e5d13e4bd1360ac0f7f1be27df51fc530c15ce3c3d782f39f34d5c58803e
 DIST gcc-11-20230127.tar.xz 76128480 BLAKE2B 4fdff08bd120fbff1b1e87d09606a9049fa28f456444c07c5d0dc3738216be3c2b418137bbb57ac79e584b68cf277033707c63a5e2ecb75497f3778f7cf3fef6 SHA512 772f4ea802aba04a63a50272b59c293b0f1a143c00b88beae98c9bef4ef3a36ad4fd50ec670113d1d031e831262fe50e0b1017536f02c8553be61b05708678b8
-DIST gcc-11.4.0-musl-patches-0.tar.xz 3844 BLAKE2B f3f1be6718e3cf08e553a1a2319a85e13368279849f6f3ab89ad7abe505316afacf5084846c0cb133bdcb5c918244644242c194e6ce55455a26e67b3983d73ef SHA512 a81db52d21de364137461dcff7e1af696df4a02fa26452f90439ae4af14ccbffe68eb4ee93ae56257490ab8aa36b4bff37c4e1f2cf4dd4624b3a6fb4cb50b7ac
-DIST gcc-11.4.0-musl-patches-1.tar.xz 4320 BLAKE2B 9f59aef44243b6d63bd9c4639b413523e74784dc0da931a9f1be75d2091f7e99c530b32b567315972a88816d6b30d2c404465a2f28138ba2cc894914d7a123fb SHA512 c174623bf40fb0cab53d1ca82fa7e0b05f0114c61c839e316dfff7678d202b850d4d5011432cf6fa40c54e563e28381e9a9f80667d9428b3f272ba8391c6ac84
 DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607 SHA512 17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c
 DIST gcc-11.4.0-patches-3.tar.xz 15200 BLAKE2B a393df941a2a31164f477d6bc0032e28319e8f0bd87200eb453708f85aa8c0bf5d67e733ee7b75cf6d14743e18cc941cee1b77a8247f8c5683d17a98cbeb280f SHA512 6f6096d95c7c62780d1070097739882393a8df5172c3a5ae811a8d4d1c98a0cd14a34f3f7e95410c8f210aec434330ac3b8876c688faeb130d7bb8fa3333ece9
 DIST gcc-11.4.0-patches-7.tar.xz 14416 BLAKE2B 3ebf62cba04cac8830a93a99d11c21347c38891db3a81493a10e02e8b7af0c86389ffbede50672dfe1189a77a67b832f8f97a1d95d43eff11db131a143b1d03d SHA512 41e2ed1ccf6d3631accccdab057877c79c99eb1b3c32f9d35628bca6c633c4f8dadb1d7f93bed2e4d7ff9f36cc9e46ea00f0e57e8af64b2e5f4b3b01285c6da3
@@ -21,7 +18,6 @@ DIST gcc-11.4.0-patches-8.tar.xz 13788 BLAKE2B a1406d5dcd906ed51ef06bb6571c216d8
 DIST gcc-12-20221126.tar.xz 79631864 BLAKE2B 3bb97ef4a1a17ab8b92b431b1f792c11131085a1b523efa08c5b4f995b44bf628be371564813e5affb1f8e2320bb8a9b04532e57b2deeef26b33f517783daa5e SHA512 163e0aa39dc5c24980f84000bd6ccd4b7c24581831b7a4cdbd63e4726be5c2b1933d034ce12c65cf95e4c0ebe1175af7e32facace465bfd7c7c377401350a2df
 DIST gcc-12-20230121.tar.xz 79652428 BLAKE2B f4f0e6474d179454dc56dd05c823fca919a894e9efdc64625bb13045c7bd549a7bab59dfb4052d45d594d4484801ab5b18cf3f3d6277be54eaec24a53abd439c SHA512 b6c2486916418a64fab64c3655329bc18ca93ee4eca240e8779bd6d8280124fcd07b1aa8eff979fd317656646ecdba9353107887338354d8bd2c1f68c1609349
 DIST gcc-12-20230128.tar.xz 79655464 BLAKE2B 6c4c6397749a3c9d11af8dd6ca1bd39312a9b06289f1f41fcf21df0cb55e3ab0b6e0efe44f4b8656ad41d6d49f6443ddda454ea5bbc956ef116cc011befe25c1 SHA512 7086b66509a9f7080805d9c4f8abf463c8e37729158eb2da60d9de97f9cdfd8664fe481a75c3730b78e12812bc9711c29554370f1af227c664ee6d3cf8708ede
-DIST gcc-12.2.0-musl-patches-1.tar.xz 3844 BLAKE2B 004432806696f7d0a32366270ac45695e858abee73a255e44dc6e0a225339e4cad40aab0d51dfe9a55d5aa4b4001f5726064bb2eea3212a0874b2d27e229abd7 SHA512 c354edcd641a9dfaf902a0ff4c44c75065d0cf1c36bbf6c3c35c2e23bff22b8f70bcf4458a5a0ef86371e9f2fafca8a54ca822e35820ff442c9458a2819c3606
 DIST gcc-12.2.0-musl-patches-7.tar.xz 3652 BLAKE2B 295ea907efea854a3c2447d472bedb24714d78b7b725476b1eac3898d89c0c549da8e69db28911205bb3293f62cf344a90ade0898ecf5fed57ff00fcf8547a9f SHA512 7a7a440bc08de8dcb37c080ea0c27904adaaadaaaafaab24d90becd2d009243dcfc886d8f674ce3ccddb4ebb5ad17f04d841064d9ec2e2e2e96a1afac3002111
 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

diff --git a/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild b/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild
index 2e1186f347bf..20cb319e02cf 100644
--- a/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild
+++ b/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild
@@ -8,7 +8,7 @@ TOOLCHAIN_PATCH_DEV="sam"
 #TOOLCHAIN_GCC_RC=1
 PATCH_GCC_VER="10.5.0"
 PATCH_VER="1"
-MUSL_VER="1"
+MUSL_VER="2"
 MUSL_GCC_VER="10.5.0"
 
 if [[ $(ver_cut 3) == 9999 ]] ; then

diff --git a/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild b/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild
index 821ee78ba0a6..d8c443e16e92 100644
--- a/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild
+++ b/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild
@@ -7,7 +7,7 @@ TOOLCHAIN_PATCH_SUFFIX="xz"
 TOOLCHAIN_PATCH_DEV="sam"
 PATCH_VER="3"
 PATCH_GCC_VER="11.4.0"
-MUSL_VER="0"
+MUSL_VER="2"
 MUSL_GCC_VER="11.4.0"
 
 if [[ $(ver_cut 3) == 9999 ]] ; then

diff --git a/sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild b/sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild
index 9c10ee0100a5..877d1c2ecf87 100644
--- a/sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild
+++ b/sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild
@@ -7,7 +7,7 @@ TOOLCHAIN_PATCH_SUFFIX="xz"
 TOOLCHAIN_PATCH_DEV="sam"
 PATCH_VER="7"
 PATCH_GCC_VER="11.4.0"
-MUSL_VER="1"
+MUSL_VER="2"
 MUSL_GCC_VER="11.4.0"
 
 if [[ $(ver_cut 3) == 9999 ]] ; then

diff --git a/sys-devel/gcc/gcc-12.2.0.ebuild b/sys-devel/gcc/gcc-12.2.0.ebuild
index aa3dfbf98f28..3b7175fe4ae0 100644
--- a/sys-devel/gcc/gcc-12.2.0.ebuild
+++ b/sys-devel/gcc/gcc-12.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 TOOLCHAIN_PATCH_DEV="sam"
 PATCH_VER="1"
 PATCH_GCC_VER="12.2.0"
-MUSL_VER="1"
+MUSL_VER="7"
 MUSL_GCC_VER="12.2.0"
 
 if [[ $(ver_cut 3) == 9999 ]] ; then

diff --git a/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild b/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild
index e1e84c1bc200..18f3ae78e0cf 100644
--- a/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild
+++ b/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 TOOLCHAIN_PATCH_DEV="sam"
 PATCH_VER="2"
 PATCH_GCC_VER="12.2.0"
-MUSL_VER="1"
+MUSL_VER="7"
 MUSL_GCC_VER="12.2.0"
 
 if [[ $(ver_cut 3) == 9999 ]] ; then

diff --git a/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild b/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild
index a2532305e37f..148aa2769b3f 100644
--- a/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild
+++ b/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 TOOLCHAIN_PATCH_DEV="sam"
 PATCH_VER="10"
 PATCH_GCC_VER="12.2.0"
-MUSL_VER="1"
+MUSL_VER="7"
 MUSL_GCC_VER="12.2.0"
 
 if [[ $(ver_cut 3) == 9999 ]] ; then