commit: 3da3bdcc3705b08bb6662ecff245881f302ff824
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Sun Sep 3 10:44:39 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Sep 3 20:54:09 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3da3bdcc
sys-devel/gcc: cleanup and sync with tree
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-devel/gcc/Manifest | 4 +--
sys-devel/gcc/gcc-5.4.0-r3.ebuild | 2 +-
sys-devel/gcc/gcc-5.4.0-r4.ebuild | 61 ---------------------------------------
3 files changed, 2 insertions(+), 65 deletions(-)
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 8840f20..1219e4e 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -50,7 +50,6 @@ DIST gcc-4.9.4-patches-1.0.tar.bz2 22266 SHA256
1a394abb77c75e2212896ad3a62ae1f6
DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 SHA256
c67b56f04c653e6a19e36abed8391f8b6bed426bfcfc907237cc37f02dbb5015 SHA512
243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285
WHIRLPOOL
1e5959441210af6f690398efab96444ab11d136238a9428912e8441eaf0509fe6db359a8aca92a446fce0c75777385475af73b20165a8593f9969e3a25fd0b0f
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.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
@@ -64,8 +63,7 @@ DIST gcc-7.1.0.tar.bz2 84303533 SHA256
8a8136c235f64c6fef69cac0d73a46a1a09bb2507
DIST gcc-7.2.0.tar.xz 62312628 SHA256
1cf7adf8ff4b5aa49041c8734bbcf1ad18cc4c94d0029aae0f4e48841088479a SHA512
f853cd6530b4055d8d8289da74687cb4c6d5f363598d386332d31852b581bac76c3adb7d61889edec3b779f63d8646f0122840f12965ce4a4389ba535dbbb6e1
WHIRLPOOL
9503fb08731d94b5d79b182579f41992e9db16dba8a034cbfa8a2703a975185859e79c1e3f6094d14d08c7f5d7135c2ca5ffd8d6f7ae7820c20d4076fe5e9f65
EBUILD gcc-4.9.4-r100.ebuild 2313 SHA256
08ca3c854dc7fdf863a659f0c745bbe92a094a60b71beb12aca2bcef8a555c1c SHA512
780400349b18484bfa253091bc0d9f17319fb892d202b226f72f114ee48d843665bf1ec00e08ef9ea0bf77ea72e13c4f1e2b732d63a252528e6d4ffcf92e151f
WHIRLPOOL
9333b35db26f056416975313e4510d775b23844c2c4c8a3847b9ccb8b010fa983adf940ba2a1577d4de45c522de26d56d638115a814bde44084d3b3bcb06ce07
EBUILD gcc-4.9.4-r99.ebuild 2261 SHA256
770df64ec98bcc6071a482abfa68b3b38a0187b6e13d58ad8b26ef8495e7ec07 SHA512
ba472cc558a94e3ed8632681c7678287fadc0303f1ff88b575e5b41e9087f9efff7332621523618eabc2fac85f71dad6a16194b9b8d55d023f77af2fe2d235b8
WHIRLPOOL
d0bbcf867f789e469171f30d8188264ee66426fba8662f26b47bb0befe91fea2d9d2ac50e640816e5c746648b478414ac62ff5db2d97452becc4d1863159a725
-EBUILD gcc-5.4.0-r3.ebuild 1934 SHA256
3d643e82c9ff1017c6ad6eb8a24994ffbbd48d70e30f0578fe4861ea60984c2d SHA512
620b95dbd9cd7b01538b8523af275b828d9f2db4760a5451a585be1cb39554d62a6ea2c0c6e3e5f7e97b82f20f8b1e18814ca82465b99a046313f98e31b1ab4a
WHIRLPOOL
72687c4950ee5e0567adf74b834d9639c4197245febcec50734093204b55f45aa0eb3f5535b79d848ab3f38b593e4850964130afa696ca41adb35793839023d6
-EBUILD gcc-5.4.0-r4.ebuild 1936 SHA256
2bb3cda67f82af445fca53eb0c198de14f24fa1764fe0bab5eabadd090cfd3c9 SHA512
e949174290ff75386a69c5c89b980e9af04a8c1002458de4dad1b213bca6389ca99e566180027b62d3f0a196080bf49dd185e1bd1aa9603c7a311994f1344804
WHIRLPOOL
f5c6df6698d1e868fea6a4b459813004898a0e88811f76c832c122ee3508bf188732a51ded3d678b90c984c80f91f6997b2ab0c3e6ead9df14b321e8364f353a
+EBUILD gcc-5.4.0-r3.ebuild 1934 SHA256
36e98bd1c5ee2d19a7697b355b8a19c7d01492684859b15a64ac8af6885e0db9 SHA512
d990dd134e345d4653ee96745436cc686a7fa2cfba3f5c0d544114636bd1796b2000e274cd7cadc67cc738282afc448795565529bc3805065b428fe849ec74ec
WHIRLPOOL
39c5aa57966317e686d471831ef73dd506da15507dddf0231cb310a590fef2aae69580eddec1d402ba728fcf3ac33bc32343bcb221f0b563372e24fb6fcdaa33
EBUILD gcc-6.3.0.ebuild 902 SHA256
f75f2d455bd332ab08dcb12ef5101319b9117ea48d773e782d7ec9e9bd017738 SHA512
2cb339bd2003d2e6c0e649377c693a5c6874583ac27d1b60ffa3bc9723f83c26554dd385154133e8384a92e85c0c134bbb787c7ba34e1ca174f05e23758d1bb2
WHIRLPOOL
88a7ef0e56136cb610f16aa92be0967f40d59d7ee1877bddc213035fd8007745beb2743b5016acfa6bf6a3f334e002e311c0e457aea2b68d4f7a9e311f6f1d4b
EBUILD gcc-6.4.0.ebuild 902 SHA256
e54104dd9fd73c8017661a03c3614e71c40bf9be73ddbe87fe11e3c7d0efb004 SHA512
1fb4edafa2d62cd6e34fb42e5b07adaeb036fae0c4819416f8f24d612c49c51fac1ad1c356d8b82822ac772919016a7125294d8609fd5209fb3a63155af56541
WHIRLPOOL
9073081c7e4453d83e8d86e664712f96422b0bc1383a416ce22b3a475a9df496e10788e93fa0462e52ff31f07b911015f5f29587cfe0ec094757a727012e83a5
EBUILD gcc-7.1.0-r1.ebuild 670 SHA256
09e9bafeeaad9b0b897d2b4da1b8c3ee56daf3401eea3f7a63ee62fd6fe696f5 SHA512
90875ac0b5bffe3488c681d375f671d54b03806613d3b4618f650f2fd44727cf687d923afe10ba1f9b0ceba2575814867ed1b28b2ed7601cdb7d97ee53a62a80
WHIRLPOOL
621007ffa8a4ce055ce5125fd51b7934f584e64577afcea24f3e2aa7e77e4d87373de7b4a9f40717afd69686838784583a2228bebe0c72feaba631baae54943b
diff --git a/sys-devel/gcc/gcc-5.4.0-r3.ebuild
b/sys-devel/gcc/gcc-5.4.0-r3.ebuild
index c9a8b41..5696f21 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 d20c004..0000000
--- a/sys-devel/gcc/gcc-5.4.0-r4.ebuild
+++ /dev/null
@@ -1,61 +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"
-PIE_MUSL_STABLE="amd64 arm ppc mips x86"
-SSP_MUSL_STABLE="amd64 arm ppc mips"
-#end Hardened stuff
-
-inherit epatch 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
-
- # Upstream Patch
- epatch "${FILESDIR}"/${PN}-4.9.3-tree-vect-data-refs-correctness.patch
- epatch "${FILESDIR}"/${PN}-5.4.0-pr68470.patch
- epatch "${FILESDIR}"/${PN}-5.4.0-pr70473.patch
-
- if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then
- epatch "${FILESDIR}"/4.9.4/gthread.patch
- epatch "${FILESDIR}"/4.9.4/boehm_gc.patch
- epatch "${FILESDIR}"/4.9.4/posix_memalign.patch
- epatch "${FILESDIR}"/5.4.0/cilkrts.patch
- epatch "${FILESDIR}"/5.4.0/linker_path.patch
- epatch "${FILESDIR}"/5.4.0/musl.patch
- epatch "${FILESDIR}"/5.4.0/ppc-secure_plt.patch
- fi
-}
