commit: 44435c8e4aae400d6778bf715f0547f4c0c6f713
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 3 06:34:38 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 3 06:34:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44435c8e
sys-devel/gcc: sync 14 w/ live
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-devel/gcc/Manifest | 2 --
sys-devel/gcc/gcc-14.0.0.9999.ebuild | 3 ++-
sys-devel/gcc/gcc-14.0.0_pre20230529.ebuild | 23 +++++++++++------------
3 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 50c735d4810f..e531f9e656c9 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -20,8 +20,6 @@ DIST gcc-13-20230527.tar.xz 83956360 BLAKE2B
86a2131b88144817673a6300c73b29c2dbb
DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B
c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb
SHA512
a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
DIST gcc-13.2.0-patches-3.tar.xz 30956 BLAKE2B
29ce043b46645640ca1e983397af3e158588ad87575f0bc59451ea4a7dd5e3bb5b190ed031de6a22cd790d423ba111e95d222187dd09985dceb12db9f0a2d907
SHA512
4ffecae7be320124ad0c4e71e39e142b7aa8db0e70b5f486f491d7a33ea31efc6464c6abeea77df02a8bd5cf81f08225d625c8af5c27f9afa32c0d7d989f7a3c
DIST gcc-14-20230529.tar.xz 84197648 BLAKE2B
1b8b812866294bafd7bf53c823b3d55288d5a30c54e921495d19286b9d04a1bf7c5228b052941200ecc61a516355d977229fc9e60cfe4353154811c1261054ab
SHA512
bba930dc4b6b6a45bb5f33e4b46dc16d1d581b266078c5492833e2b4e64a93d2d19389a436c64dc2159240b07134f4f7242bef3cf35f303d34e10bf493fe70ba
-DIST gcc-14.0.0-musl-patches-1.tar.xz 3576 BLAKE2B
692baee8a7709905d53aeb150d73a3721c4ba47ee5f397cfb1b5be905cf003ca02b60c94ee294d90ac39645cd5cdf186c7a3aa950c47d8cf680c128ed705b807
SHA512
0592ab98a7142e404623a6511c67dff61e9ade32c3fb2c0e75b456306e0af3799ad13252b50b3d2fdd31e5815d7f0b16b0ad63ab8386fe4d78729fc9c182d617
-DIST gcc-14.0.0-patches-1.tar.xz 11612 BLAKE2B
a3b0f3952cf7a6fb095817f4727ccb5cff24607a5c2bb67d280da4651177132ddcf398243998271c509ccaf3445d4843ff691a12d5c394dad8d9c70fc4a8120d
SHA512
66701c2e4fd1a031ffcb353a3a9cd1fe25d3d62167065523097e41a3e48adf4218ecf08e382e3ea22014c561ba3a15681650c5538cda91d38c69cbbf04503a74
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-14.0.0.9999.ebuild
b/sys-devel/gcc/gcc-14.0.0.9999.ebuild
index b40253ddae67..1d6aff0d5254 100644
--- a/sys-devel/gcc/gcc-14.0.0.9999.ebuild
+++ b/sys-devel/gcc/gcc-14.0.0.9999.ebuild
@@ -35,7 +35,8 @@ if tc_is_live ; then
EGIT_BRANCH=master
elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
# Don't keyword live ebuilds
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86"
+ #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86"
+ :;
fi
if [[ ${CATEGORY} != cross-* ]] ; then
diff --git a/sys-devel/gcc/gcc-14.0.0_pre20230529.ebuild
b/sys-devel/gcc/gcc-14.0.0_pre20230529.ebuild
index 1b25d3519a6e..1d6aff0d5254 100644
--- a/sys-devel/gcc/gcc-14.0.0_pre20230529.ebuild
+++ b/sys-devel/gcc/gcc-14.0.0_pre20230529.ebuild
@@ -4,19 +4,17 @@
EAPI=8
TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="1"
PATCH_GCC_VER="14.0.0"
-MUSL_VER="1"
MUSL_GCC_VER="14.0.0"
-if [[ $(ver_cut 3) == 9999 ]] ; then
+if [[ ${PV} == *.9999 ]] ; then
MY_PV_2=$(ver_cut 2)
- MY_PV_3=$(($(ver_cut 3) - 9998))
+ MY_PV_3=1
if [[ ${MY_PV_2} == 0 ]] ; then
MY_PV_2=0
MY_PV_3=0
else
- MY_PV_2=$(($(ver_cut 2) - 1))
+ MY_PV_2=$((${MY_PV_2} - 1))
fi
# e.g. 12.2.9999 -> 12.1.1
@@ -32,13 +30,14 @@ fi
inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-#EGIT_BRANCH=master
-
-# Don't keyword live ebuilds
-#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
+if tc_is_live ; then
+ # Needs to be after inherit (for now?), bug #830908
+ EGIT_BRANCH=master
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+ # Don't keyword live ebuilds
+ #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86"
+ :;
+fi
if [[ ${CATEGORY} != cross-* ]] ; then
# Technically only if USE=hardened *too* right now, but no point in
complicating it further.
