diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-06-10 09:50:45 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-06-10 09:50:45 +0100 |
| commit | 3d00647fec2600e217d690a64ba45a41f1a2fa0c (patch) | |
| tree | 372903cfdc422592f1c2b4df752276358d1e7984 /sys-devel/gcc/gcc-12.2.1_p20230428-r1.ebuild | |
| parent | e0b23919d82070530276a893043523d8084be1e8 (diff) | |
gentoo auto-resync : 10:06:2023 - 09:50:45
Diffstat (limited to 'sys-devel/gcc/gcc-12.2.1_p20230428-r1.ebuild')
| -rw-r--r-- | sys-devel/gcc/gcc-12.2.1_p20230428-r1.ebuild | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/sys-devel/gcc/gcc-12.2.1_p20230428-r1.ebuild b/sys-devel/gcc/gcc-12.2.1_p20230428-r1.ebuild index bba4e8fe97f7..d1ff9bb68321 100644 --- a/sys-devel/gcc/gcc-12.2.1_p20230428-r1.ebuild +++ b/sys-devel/gcc/gcc-12.2.1_p20230428-r1.ebuild @@ -4,38 +4,40 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="2" PATCH_GCC_VER="12.3.0" +PATCH_VER="2" MUSL_VER="1" MUSL_GCC_VER="12.3.0" -if [[ $(ver_cut 3) == 9999 ]] ; then +if [[ ${PV} == *.9999 ]] ; then MY_PV_2=$(ver_cut 2) + 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 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} 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" + GCC_TARBALL_SRC_URI="mirror://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" +if tc_is_live ; then + # Needs to be after inherit (for now?), bug #830908 + EGIT_BRANCH=releases/gcc-$(ver_cut 1) +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 @@ -48,6 +50,13 @@ if [[ ${CATEGORY} != cross-* ]] ; then fi 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 |