commit: 3cf4882da013d6b84dcc3a5823df7d27b3dafdb6
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 24 18:51:26 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 19:15:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cf4882d
sys-devel/gcc: Bump patchset in -r3 to add build fix for bug 620164; remove
unkeyworded -r4
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sys-devel/gcc/Manifest | 1 -
sys-devel/gcc/gcc-5.4.0-r3.ebuild | 2 +-
sys-devel/gcc/gcc-5.4.0-r4.ebuild | 44 ---------------------------------------
3 files changed, 1 insertion(+), 46 deletions(-)
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index c7805fa6264..57aa70db4d2 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -46,7 +46,6 @@ DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 SHA256
c67b56f04c653e6a19e36abed8
DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 SHA256
95f290d0b68114d835515afc424d6096476a45665671784aa71a7a506296e465 SHA512
5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db
WHIRLPOOL
e46b08737cfdc235bfb80117e0389f3969167adf59bcba2a0a1094a20eab2b62f0c952dac44781e43957cb1507cd4e80f37bd8aecbc55dbda6382d93b3a4cf94
DIST gcc-4.9.4.tar.bz2 90097606 SHA256
6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 SHA512
93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe
WHIRLPOOL
e20045126c21a3edea1fa4a2185ec2bc5feec77ddf967ab9d1e8c33322ad4eafe013bfcaab1ed4e35971d3b70ef373ea3585ebb089c9bbf91bbfca1f1da71236
DIST gcc-5.4.0-patches-1.0.tar.bz2 28227 SHA256
ff600369f150129754108322338c3f4f0064d222843a2d82778537f94a22ecbb SHA512
70cd83b142abaa3c22d67d5d58185da2cfa178737ec963e230cc03ea8dc6dc757665c711fae91af4cd91062d3136c6f31a5ee3c4c7440ed9485c6f3632731940
WHIRLPOOL
84a69d2dde582fd486f6c60f78ce9f8c7cc5b480c2989cc1804617eb6526a4a17d20d2ed010bd9fc78019d69caa665428970234090b21f9d4b97217011d4fcd6
-DIST gcc-5.4.0-patches-1.3.tar.bz2 28942 SHA256
b23d1517b626b48e69ecac87878467044a91cabb256e3185bf8e1e00fcde230f SHA512
f75fcf07ca19e43650e3fe6f9baad74205150c009823465f04505b45876d623a56fd6dfc8e67a35e2df36839750cad2561d0f0581154df0b553d6a608730aaf4
WHIRLPOOL
eacfc125cf7c5281101f887b3a617df01e3c32d1f66fe377371c33da2819a404ea3cff603b9f3a0b3a49a5875137842b9e94ab8905a069fa20b6da3e59f56b96
DIST gcc-5.4.0-patches-1.4.tar.bz2 28425 SHA256
039b88a939c3b90777fb94c58980cbcfffcdca4365db044dae0677302a4365d1 SHA512
c4922cf0f83cd3b6ed9c50ffb39847a03beb95031865d36d86ae48fdd912c0bd6842ad71a3b0d18a91786ed58e2e529630c6ccd2a0414a48892415051c70246e
WHIRLPOOL
6d0a73cfb4ea387811bcd81b2de98a11e2f656a4df7ee5a887cd15d0a744662d85b22fcff86a6953f7c6bcc6d822333528de91b793191e72fe5ff2354deb7a97
DIST gcc-5.4.0-piepatches-v0.6.5.tar.bz2 14551 SHA256
495eb9110244dac17408cd0eb6977a593577eeb0437e72b60339b8ec394f2fb0 SHA512
4890f0713d261982ab81a20f93c5f65193aa1dfa171e3f9e5867f0b80ec7c1e76c5a997b1a4e6f47f8ce36af54ac91125c5bff8bf6d971b7d77c65a57a40a3c0
WHIRLPOOL
13b74b1ca75cc94f9624fe1b52221a953962c918c2cb932302a3078b6deba4f3e501647ad8a2915edef6301e64c820ed612a6fbb9e1178cf1711fe0045686969
DIST gcc-5.4.0-uclibc-patches-1.0.tar.bz2 3731 SHA256
a3145faa6c81c0753ba754b735834c38987c356dadaa7c4a625c738e374604b5 SHA512
009f34197e79c5e8c6497a0db01ac45cc657e92e56a663b4f3281661d108b2a129cd977fab5f0064f225d6812ae91e82bab22a2b10ae02c486881eeed85ec7a3
WHIRLPOOL
a3598ce0aad7e9110db156005190739abc5b4ceea3c327cb9c747c4cf1b99589c1a9fac170aea346eae030b09ee563f9f990e031ad7dfa1aa19b895898bf2608
diff --git a/sys-devel/gcc/gcc-5.4.0-r3.ebuild
b/sys-devel/gcc/gcc-5.4.0-r3.ebuild
index d186cd4b430..588338f8fe1 100644
--- a/sys-devel/gcc/gcc-5.4.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-5.4.0-r3.ebuild
@@ -3,7 +3,7 @@
EAPI="4"
-PATCH_VER="1.3"
+PATCH_VER="1.4"
UCLIBC_VER="1.0"
# Hardened gcc 4 stuff
diff --git a/sys-devel/gcc/gcc-5.4.0-r4.ebuild
b/sys-devel/gcc/gcc-5.4.0-r4.ebuild
deleted file mode 100644
index 4dbcada9f7f..00000000000
--- a/sys-devel/gcc/gcc-5.4.0-r4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-PATCH_VER="1.4"
-UCLIBC_VER="1.0"
-
-# Hardened gcc 4 stuff
-PIE_VER="0.6.5"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
-SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
-# uclibc need tls and nptl support for SSP support
-# uclibc need to be >= 0.9.33
-SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
-#end Hardened stuff
-
-inherit toolchain
-
-# KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh
~sparc x86 ~amd64-fbsd ~x86-fbsd"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- elibc_glibc? ( >=sys-libs/glibc-2.8 )
- >=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
- PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
- if has_version '<sys-libs/glibc-2.12' ; then
- ewarn "Your host glibc is too old; disabling automatic fortify."
- ewarn "Please rebuild gcc after upgrading to >=glibc-2.12
#362315"
- EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
- fi
- is_crosscompile && EPATCH_EXCLUDE+=" 05_all_gcc-spec-env.patch"
-
- toolchain_src_prepare
-}
