sys-devel/gcc: backport Harfbuzz build fix

Only affects last snapshots (12.2.1_p20230204, 13.0.1_pre20230205).

Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107461
Closes: https://bugs.gentoo.org/893410
Signed-off-by: Sam James <sam@gentoo.org>

3 files changed, 108 insertions, 0 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 22e5724d9d30..38bc16f059a3 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -25,6 +25,7 @@ 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-11.tar.xz 13652 BLAKE2B 3747d3e337ec2f2758fba90f5ffffb1ff62129e5752031c43934211806d96e1153039e4cd6d8d28c19fdf5d5f0d1f4875388dbb177a300aacd50124e38a7ed7c SHA512 50f9a6b0bd8b18dfb0bdc0a7179f26bd4cf8de7970c0b64a0cd9c8c92c002708ae961b9c904b735f15f827b3b8dab447515112d9b64e8f59568eb1e208029277
+DIST gcc-12.2.0-patches-12.tar.xz 15880 BLAKE2B 312144c6d881a7fbc1dd078a8d7c410a0354980ea58d31b24b377cda38383c04ac6392f5fd780ec0a7483232019cb90271fdc2e0c8b5d4556ccd1baa96de0720 SHA512 68c7352c661d74c159f20eb5ab9a6f8d95cac728e40fdb32cd61dd476feaf6caa0bdd917c6f1e3d915731533c7937eb96a49c1f39b9c2be86bb3f63079493540
 DIST gcc-12.2.0-patches-2.tar.xz 13952 BLAKE2B a9e798911acaf45c3f585f69721130cfbecec016727a50ac0f4767b37a2ab9df39e0828abb07f1e429619cc102808f81af8422fef0265415c287d303d9d97fc0 SHA512 1808a05e98094577099d115ff5f3e136e3fc8f39fbe35c5183fd7775383f94439212e5e4174ab8d0ae8c0874e227ff84a958ffdfa1c99c9a8306a9842d126ef9
 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
 DIST gcc-13-20230122.tar.xz 82869800 BLAKE2B fff4bee436910ba587640600a95c2a89ddec415e12f629c941c8b27d28202c62b39dac2ca0b5d82d9fb4ca271310b178e89202f488f5ef4a7fbc63cd3ecfd7d7 SHA512 a24c0acedc81f72104fe13aba7403ee8920949089971aad5a296de7b46b8969d82b77df92bfd4ef2537b2e5c2010b72d3a33e3bf35ff734d9c49a7a1746026b5
@@ -33,6 +34,7 @@ DIST gcc-13-20230205.tar.xz 83535700 BLAKE2B 0a4ac98652dd0a0777133b23ab6e9b3855f
 DIST gcc-13.1.0-musl-patches-1.tar.xz 3528 BLAKE2B c572ab4a0fb929b16ec36b3a3616cdcccd62f7ee27ded8077008b9beb50539db64cc251ff8a3eade54e8ebfe1012f8f32d0802379bf8ffb0f1b8ce7c8457da37 SHA512 ffb7dfa54a9d23b5333664e915efd9f18a43cd696f4ff5669a8b072a0e9cf4978de53e315123542441a2533e4f269de0bb7d90ee7a37d3a7517b7cda6ea06681
 DIST gcc-13.1.0-patches-5.tar.xz 11404 BLAKE2B 5ba2b4002e917750757a28fa4c7ff6ff7090c35f28eb984aee6ad7fc0ac80c88a9d08e1d4d9efa98e6bd3f06e89df47b10b51f8294bb7d2ef0d1ac3fd2a1a963 SHA512 6864738794237bd7430c612404dd4b84e275362cb5abd081284a91e5b24c1b0aa97d90b9543168c72147be146887219715325d52ae2920912d9c4e17e7224aa3
 DIST gcc-13.1.0-patches-6.tar.xz 11552 BLAKE2B 65ad3f4f9f767712ba11146edc25c7cc8ceb66a42f031059f904a4bb36171065489f4b72f55f85665fac275c11bf1f9a19d546747eaba7d835d2bdccf4211db7 SHA512 4d8f7f59469a64ca541a62bb48983603db540434c5763dd157960f176b05f69360a36a0b057263e6c21148a74ec5e3eeb78f8eef0924a3a4f6af1c83bbcb1c67
+DIST gcc-13.1.0-patches-7.tar.xz 13472 BLAKE2B 186d2c4144759ceef40d7dcffb44a1b0b63b641fc7d11144444991f0f6dd25e00ae0561ce4a1f54231216d089f63557b3758c881b6b3aca7e940c18b9308e2f2 SHA512 6f793e0ce69f52b73289f1d8bc6e89ab84c380c3fe311740e31890001412643a49a4865fb33a3403ce229e5d5060157edd438a5f3d7621b4fc1b9f98aa6c9969
 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
 DIST gcc-9.5.0-patches-1.tar.xz 13772 BLAKE2B 2e2e84a28a729cd271a23716ff3fe08b7209b72254af279f04dd15dbd39482fb7d905dc9293dc326536e14bca9a53397bd7e1c4b617ed8cbe42bcf617fcce3fb SHA512 50e292e665bfae18bf71c0714074025b4f7cb87042862071815874f7c5b241acac3b8f60d85b8970b11978103c2e7616c02d789f6c3b091d7b736b65c535b743
diff --git a/sys-devel/gcc/gcc-12.2.1_p20230204-r1.ebuild b/sys-devel/gcc/gcc-12.2.1_p20230204-r1.ebuild
new file mode 100644
index 000000000000..f06e3092b92d
--- /dev/null
+++ b/sys-devel/gcc/gcc-12.2.1_p20230204-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="12"
+PATCH_GCC_VER="12.2.0"
+MUSL_VER="7"
+MUSL_GCC_VER="12.2.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))
+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 ~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.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+
+src_prepare() {
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-devel/gcc/gcc-13.0.1_pre20230205-r1.ebuild b/sys-devel/gcc/gcc-13.0.1_pre20230205-r1.ebuild
new file mode 100644
index 000000000000..168e1635cbbd
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.0.1_pre20230205-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="7"
+PATCH_GCC_VER="13.1.0"
+MUSL_VER="1"
+MUSL_GCC_VER="13.1.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=$(($(ver_cut 3) - 9998))
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=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}.${MY_PV_3}
+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"
+	KEYWORDS="~loong"
+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.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND="${CATEGORY}/binutils[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
+}