summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-05-07 22:01:19 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2020-05-08 01:30:59 +0100
commit8ff1ffb283bb4377e463f5e9e2608ff7c98185e2 (patch)
treeea4c31b356a9d459a3abcf68ae8d2534dd302994
parentsys-devel/gcc: switch live versions to BDEPEND-style deps (diff)
downloadgentoo-8ff1ffb283bb4377e463f5e9e2608ff7c98185e2.tar.gz
gentoo-8ff1ffb283bb4377e463f5e9e2608ff7c98185e2.tar.bz2
gentoo-8ff1ffb283bb4377e463f5e9e2608ff7c98185e2.zip
sys-devel/gcc: use gcc-10.1.0 patchset against live ebuilds
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-rw-r--r--sys-devel/gcc/gcc-10.1.1_pre9999.ebuild19
-rw-r--r--sys-devel/gcc/gcc-11.0.0_pre9999.ebuild19
2 files changed, 4 insertions, 34 deletions
diff --git a/sys-devel/gcc/gcc-10.1.1_pre9999.ebuild b/sys-devel/gcc/gcc-10.1.1_pre9999.ebuild
index aaebb18cacec..ff3ea3509670 100644
--- a/sys-devel/gcc/gcc-10.1.1_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-10.1.1_pre9999.ebuild
@@ -3,8 +3,8 @@
EAPI="7"
-PATCH_GCC_VER="9.3.0" # reuse subset of patches for latest for live ebuilds gcc
-PATCH_VER="2"
+PATCH_GCC_VER="10.1.0" # reuse subset of patches for latest for live ebuilds gcc
+PATCH_VER="1"
inherit toolchain
@@ -13,18 +13,3 @@ inherit toolchain
RDEPEND=""
BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
- local p ignore_patches=(
- 11_all_extra-options.patch # needs a port
- 27_all_default_ssp-buffer-size.patch # needs a port
-
- 12_all_pr55930-dependency-tracking.patch # upstreamed
- 25_all_ia64-bootstrap.patch # upstreamed
- )
- for p in "${ignore_patches[@]}"; do
- mv -v "${WORKDIR}"/patch/"${p}" "${WORKDIR}"/patch/"${p}"_disabled || die "failed to disable '${p}'"
- done
-
- toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild b/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
index 8d31708b6eef..12a6ad6eb62d 100644
--- a/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
@@ -3,8 +3,8 @@
EAPI="7"
-PATCH_GCC_VER="9.3.0" # reuse subset of patches for latest for live ebuilds gcc
-PATCH_VER="2"
+PATCH_GCC_VER="10.1.0" # reuse subset of patches for latest for live ebuilds gcc
+PATCH_VER="1"
inherit toolchain
@@ -15,18 +15,3 @@ EGIT_BRANCH=master
RDEPEND=""
BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
- local p ignore_patches=(
- 11_all_extra-options.patch # needs a port
- 27_all_default_ssp-buffer-size.patch # needs a port
-
- 12_all_pr55930-dependency-tracking.patch # upstreamed
- 25_all_ia64-bootstrap.patch # upstreamed
- )
- for p in "${ignore_patches[@]}"; do
- mv -v "${WORKDIR}"/patch/"${p}" "${WORKDIR}"/patch/"${p}"_disabled || die "failed to disable '${p}'"
- done
-
- toolchain_src_prepare
-}