commit: bc69c65da37b869b7bd20007efbf074ed0467d31
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 03:54:09 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 05:31:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc69c65d
sys-devel/gcc: add 12.1.1_p20220812 (12.2 RC1)
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-devel/gcc/Manifest | 1 +
...2.2.9999.ebuild => gcc-12.1.1_p20220812.ebuild} | 24 +++++++++++++---------
sys-devel/gcc/gcc-12.2.9999.ebuild | 8 ++++++++
3 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index d5a6420eb986..238572ba3668 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -26,6 +26,7 @@ DIST gcc-12.0.0-patches-5.tar.xz 9820 BLAKE2B
cdebb6fa59e594f95cc4b028d329c0fed3
DIST gcc-12.1.0-musl-patches-6.tar.xz 3840 BLAKE2B
5d8ce4dcebd081fae485d3e1367c06c185e07c110b0cfe9598b71209c55adf96a26e198ab91fb3dfb33ddb2d8abd211a518dd74f5113cae1e3a4f90db32bb746
SHA512
b666ac0e9bef1b74dc5cc616ddb13dc40d9ecd1f5ae48b877cc1003356952a9afd800327d4210c732deb94554403d9b8730d2037bec380e413fc9a6cb59ecf23
DIST gcc-12.1.0-patches-9.tar.xz 12536 BLAKE2B
ceb045b2a5c5a2a3047d73296fa1057421ef58c7f793d1f031f43dbd1a6faf49bdf1956e96a4f8e34c4d3fde2c26fcc9b146c223d8b1b3e1f944c2ec8574b786
SHA512
b899ec2d6da65df0f32838be3c89dbb1dc6b423133aa5121635547a1aa18b5d52b920e62522143682c0818baf185ebacb75ab84383ef0ad9768ba567807da5f4
DIST gcc-12.1.0.tar.xz 82701928 BLAKE2B
dca5df8fea680dbeda721742cce5c97de7eb4be490a32a158e06b88e2b9dd092150b7cfe490bb69e48e2f75d8bba231c8a54cd46b48ddcdc01bf9553ab57019d
SHA512
2121d295292814a6761edf1fba08c5f633ebe16f52b80e7b73a91050e71e1d2ed98bf17eebad263e191879561c02b48906c53faa4c4670c486a26fc75df23900
+DIST gcc-12.2.0-RC-20220812.tar.xz 84732336 BLAKE2B
de38eab480965e44d64ccda40070aadb0e892732b6fd4cd80feb5636aff2b14ee0ca2fb0ed38fb1ba46d83c6173a60069a9335cc0f321451edaac387c832056d
SHA512
74d6f7c9cb1070920ae85533b6db986c3a784f74a3f5eac113c483230b78737c33bc6f10a2221ace7f9c8af0e3824390241da73d367dd77e5832205a47a47940
DIST gcc-13-20220731.tar.xz 79440792 BLAKE2B
c7b6e8113c5c858b0e348ce930ca71c3386b91d62f4a3355df38e899dff26f9e02d44673ad1d57a93a5edb3f8633b9f8fc74b779059b9fdb54ebc0f73c95ef36
SHA512
58e320f19cebe4d7364a64a2ded60ef6fb8f68d6abcd3a3c13b0a23ab016d4f40cd9e0e12f665b713314c34b46a65c263a4f04bfac01a7f476755987365aa4e0
DIST gcc-13-20220807.tar.xz 79472584 BLAKE2B
d23ad0d06414c0e7dfc11473641abb63585c95a07b1da50f3c9d6ae6ba3f365b7bd17297914670468e8b26e4146c8de2dc35c0b96ddc752a07c1dca3a0227dce
SHA512
03aed1aa6a73b4aaa5318e456334132576036ee859a26eba3d49826a03da554cec22739cc4fae441f72eb5ea53449e75b73e8f3a41192e09a6e00d4fc227a4ee
DIST gcc-13.0.0-patches-1.tar.xz 11064 BLAKE2B
82a7ad193dac00475931840bcee82ef7a51718a74af224b03a41f8349e34c2a64a3eb29985b4e2bffde958c58782242eccaedaa54d950e8d51d8bb6f45868e0e
SHA512
e04b510f529dd3187a08ae9cb9a894a3d3d30af81f13c43cc082fda7d26c44a3bf19d36ec02024b2ade8b8c193e9730246abeadee603c41b5873c5b785709921
diff --git a/sys-devel/gcc/gcc-12.2.9999.ebuild
b/sys-devel/gcc/gcc-12.1.1_p20220812.ebuild
similarity index 64%
copy from sys-devel/gcc/gcc-12.2.9999.ebuild
copy to sys-devel/gcc/gcc-12.1.1_p20220812.ebuild
index d1a72887e795..9be0f30fd1e6 100644
--- a/sys-devel/gcc/gcc-12.2.9999.ebuild
+++ b/sys-devel/gcc/gcc-12.1.1_p20220812.ebuild
@@ -3,8 +3,11 @@
EAPI=8
+TOOLCHAIN_GCC_RC=1
TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="9"
PATCH_GCC_VER="12.1.0"
+MUSL_VER="6"
MUSL_GCC_VER="12.1.0"
if [[ $(ver_cut 3) == 9999 ]] ; then
@@ -17,16 +20,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 ~loong ~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.
@@ -36,13 +47,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
diff --git a/sys-devel/gcc/gcc-12.2.9999.ebuild
b/sys-devel/gcc/gcc-12.2.9999.ebuild
index d1a72887e795..cf4fddcdf19e 100644
--- a/sys-devel/gcc/gcc-12.2.9999.ebuild
+++ b/sys-devel/gcc/gcc-12.2.9999.ebuild
@@ -17,9 +17,17 @@ 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)
