commit:     b892db1efb50a79309b58a6ef5b99d34ea056b6a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 13 21:51:35 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 13 21:54:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b892db1e

sys-devel/gcc: update patches to disable F_S when ASAN is set

This can cause either false positives in warnings from the compiler or false
negatives where the sanitizer misses something, so don't default-enable 
FORTIFY_SOURCE
when -fsanitize=address is set to be safe.

Bug: https://github.com/google/sanitizers/issues/247
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/gcc/Manifest                                                  | 2 ++
 .../gcc/{gcc-12.2.1_p20230311.ebuild => gcc-12.2.1_p20230311-r1.ebuild} | 2 +-
 .../{gcc-13.0.1_pre20230312.ebuild => gcc-13.0.1_pre20230312-r1.ebuild} | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 2edea4f18e1e..642e9683316e 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -22,12 +22,14 @@ DIST gcc-12.2.0-musl-patches-7.tar.xz 3652 BLAKE2B 
295ea907efea854a3c2447d472bed
 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-13.tar.xz 13756 BLAKE2B 
df0388a669458f2991951d2f4027badbff3f802e6a0422478206b5cdda76e70b531a474d2ac42817e9e7f8200e9ac35ca8276af539839b4ebb2e22903ec25a23
 SHA512 
2970de9d2806d59c5d0f77e66000860c816ebd674489db8114f48f6aa11575644154431480222580b520b9e312647b06f94ab38959a49a8cda818158d6babf1d
+DIST gcc-12.2.0-patches-14.tar.xz 13752 BLAKE2B 
c44609a8a3a96480f144b7e6859c2b1d7105f421ffa08929c35fc13eb5ec11d967b02cf8248ecb4ea85824b1872125a73c92f404050c3399d5c06fe668711fd3
 SHA512 
c1db7a7f3a929dfdc8de9a662448f57296ab818b9fd133763b2ab0dddce2e01cf322e5ac53f3d69c2366053ef3c4fa44c72eed248dc7aeef49f558341bdd3854
 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 
715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da
 SHA512 
e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
 DIST gcc-13-20230226.tar.xz 84264388 BLAKE2B 
fea763a1627bff19eb0f7869b83c00337dc2a203178d17143c98c2c1d3fd385d2f853f195ff79ecc1cae659a1f8704c88e7fd77456eed4510bdcba7631e49353
 SHA512 
38de82dd54e1b57490f5492a4adcd05b9da3ace2235654dff19bade8d378e75be1495f3b2b4e7f7e57ea144351c4ade1e9a5b141546259024f0359f43b2025ac
 DIST gcc-13-20230305.tar.xz 84314220 BLAKE2B 
cf4971cddea6981e3dfb62dd7d69b85b85df0a137e0596f71530966186f2919e800e60b6712b1d676b4250e835db8601af5376a77dad82fff7b1d9faae012da8
 SHA512 
39320f90bcdc2d8f5cefa2c8ac551d7a6f0d20744cdff5ed8956321d6b0813bbc44d18266bf7bb7ebbe642078a6d9677216e6db939dd56186959e5454d7d3a85
 DIST gcc-13-20230312.tar.xz 84361832 BLAKE2B 
4099036d7224cbdb9cfd8fb454201a80f76ea9569d8625d4cedc14ed30caf0a4b88a60b5f9fff12001a19a928909489609da3634c109e457f9b6dedcd20a947d
 SHA512 
7513ebdbe9e6116658c4bafdc71f122cae3cf7233b91402bc1d05fe1fec0ff036ed613b1db3af2b235fc153c862f428cd297da6ba0e6e81e1e7962fa0550e01e
 DIST gcc-13.1.0-musl-patches-1.tar.xz 3528 BLAKE2B 
c572ab4a0fb929b16ec36b3a3616cdcccd62f7ee27ded8077008b9beb50539db64cc251ff8a3eade54e8ebfe1012f8f32d0802379bf8ffb0f1b8ce7c8457da37
 SHA512 
ffb7dfa54a9d23b5333664e915efd9f18a43cd696f4ff5669a8b072a0e9cf4978de53e315123542441a2533e4f269de0bb7d90ee7a37d3a7517b7cda6ea06681
 DIST gcc-13.1.0-patches-8.tar.xz 11644 BLAKE2B 
aaa135a7d22badc22eeba42fe92c2de40e1a779836f42b5ba15884ad3d756020421b99e29b9a27f40368013fb9d8348e3ca1ef3541a6de55129d66f4645caf8f
 SHA512 
a71ef0f215451c840a99d7100489e8364e4e7a71d83e9be42e35fb06d4276afadb64834801ef3469a4edb78eede5a03c18104215fef3039f98da3b3d0c8e69af
+DIST gcc-13.1.0-patches-9.tar.xz 11720 BLAKE2B 
c26a2924fa8aab318a1f4a4974ca4aeba255f3605fa0cbf448a4e48b6f3e9359012aeae15726299059257b93043c5cdd86bf1b2f2fffd4b9a096ab411a0503ba
 SHA512 
98e48abaa664ea18bf00ba7bdb29cc1e908cc55ba9d12d52061e86fc917753ade8e38a190c04d23c63102808ac5a9e8ecf085dcc29a1568a329ceb5d43cf0290
 DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 
7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7
 SHA512 
1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6
 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B 
aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12
 SHA512 
92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8
 DIST gcc-9.5.0-patches-2.tar.xz 14324 BLAKE2B 
1d3bf3e673108ad2fcdcb86daefb4603d1c9f6aa815e34d1591054d466b76d6f50cce124ab4760528c4951ea16eb00888a3e6485417f81ebf250548732df4a8e
 SHA512 
a6d6f650aaf0bd193a17ac279649f0544a282cea295824384c59341c3000eac4b574b60e00dd427585d928f9768166abf85168b47772132790ad98854acacbbf

diff --git a/sys-devel/gcc/gcc-12.2.1_p20230311.ebuild 
b/sys-devel/gcc/gcc-12.2.1_p20230311-r1.ebuild
similarity index 98%
rename from sys-devel/gcc/gcc-12.2.1_p20230311.ebuild
rename to sys-devel/gcc/gcc-12.2.1_p20230311-r1.ebuild
index 3a7a472a2f2f..cb82e2228437 100644
--- a/sys-devel/gcc/gcc-12.2.1_p20230311.ebuild
+++ b/sys-devel/gcc/gcc-12.2.1_p20230311-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="13"
+PATCH_VER="14"
 PATCH_GCC_VER="12.2.0"
 MUSL_VER="7"
 MUSL_GCC_VER="12.2.0"

diff --git a/sys-devel/gcc/gcc-13.0.1_pre20230312.ebuild 
b/sys-devel/gcc/gcc-13.0.1_pre20230312-r1.ebuild
similarity index 98%
rename from sys-devel/gcc/gcc-13.0.1_pre20230312.ebuild
rename to sys-devel/gcc/gcc-13.0.1_pre20230312-r1.ebuild
index 6b843430b057..1f65b8ba8aab 100644
--- a/sys-devel/gcc/gcc-13.0.1_pre20230312.ebuild
+++ b/sys-devel/gcc/gcc-13.0.1_pre20230312-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="8"
+PATCH_VER="9"
 PATCH_GCC_VER="13.1.0"
 MUSL_VER="1"
 MUSL_GCC_VER="13.1.0"

Reply via email to