commit: 398a572f5480bf6cb553a31d1ba37da8d876960a
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Aug 3 21:45:37 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Aug 3 21:45:37 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=398a572f
sys-devel/gcc: version bump to 6.4.0
eclass/toolchain.eclass | 18 ++++++++++++++++--
sys-devel/gcc/Manifest | 5 ++++-
sys-devel/gcc/gcc-5.4.0-r3.ebuild | 2 +-
sys-devel/gcc/gcc-6.4.0.ebuild | 35 +++++++++++++++++++++++++++++++++++
4 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 77cad2c..b996315 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -178,6 +178,12 @@ fi
tc_version_is_at_least 4.5 && RDEPEND+=" >=dev-libs/mpc-0.8.1:0"
+if in_iuse objc-gc ; then
+ if tc_version_is_at_least 7 ; then
+ RDEPEND+=" objc-gc? ( >=dev-libs/boehm-gc-7.4.2 )"
+ fi
+fi
+
if in_iuse graphite ; then
if tc_version_is_at_least 5.0 ; then
RDEPEND+=" graphite? ( >=dev-libs/isl-0.14 )"
@@ -314,7 +320,11 @@ get_gcc_src_uri() {
elif [[ -n ${SNAPSHOT} ]] ; then
GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2";
else
-
GCC_SRC_URI="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.bz2"
+ if tc_version_is_between 5.5 6 || tc_version_is_between 6.4 7
|| tc_version_is_at_least 7.2 ; then
+
GCC_SRC_URI="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.xz"
+ else
+
GCC_SRC_URI="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.bz2"
+ fi
# we want all branch updates to be against the main release
[[ -n ${BRANCH_UPDATE} ]] && \
GCC_SRC_URI+=" $(gentoo_urls
gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2)"
@@ -418,7 +428,11 @@ gcc_quick_unpack() {
elif [[ -n ${SNAPSHOT} ]] ; then
unpack gcc-${SNAPSHOT}.tar.bz2
elif [[ ${PV} != *9999* ]] ; then
- unpack gcc-${GCC_RELEASE_VER}.tar.bz2
+ if tc_version_is_between 5.5 6 || tc_version_is_between 6.4 7
|| tc_version_is_at_least 7.2 ; then
+ unpack gcc-${GCC_RELEASE_VER}.tar.xz
+ else
+ unpack gcc-${GCC_RELEASE_VER}.tar.bz2
+ fi
# We want branch updates to be against a release tarball
if [[ -n ${BRANCH_UPDATE} ]] ; then
pushd "${S}" > /dev/null
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 92953bb..4ab8638 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -55,11 +55,14 @@ DIST gcc-5.4.0-uclibc-patches-1.0.tar.bz2 3731 SHA256
a3145faa6c81c0753ba754b735
DIST gcc-5.4.0.tar.bz2 95661481 SHA256
608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a SHA512
2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b
WHIRLPOOL
ec81c8143e48bc8d9d0bbdc0fa3ca553c805193f53ac46c86127b54565894780dd97281485e396a130567464c753f043458c8e450018c957813f50ff90a40708
DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 SHA256
6c880468ffa4ad2b324fd18c762dbdf10646089c8ab865c228e166f99a0e049c SHA512
8fc96086bd3da3726687ee9d180d3b5d0a7d5814141d44eac8eb01566a783ec780c8fb8f55f75d6e9c9006b2e407e20cdb5835d541b0b66a47dd60642861734c
WHIRLPOOL
b1bce94d6134db6c9aff4298c6c7af003e39d0411aa40cd027d2c7d6a256971c81fb557e85b25f1107e9a474cb7d772c3bc62a7a4ab7ff7fca5eeae5b2ca0c94
DIST gcc-6.3.0.tar.bz2 99903185 SHA256
f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f SHA512
234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78
WHIRLPOOL
e79a2d6ad199396b6efd835c1129d049a367174ea33dd3b6247d72461f117c2dd81e5a66f3dd6427ce500e768d3a4453efd0debcb56966d00c7df79d05d54b7d
+DIST gcc-6.4.0-patches-1.0.tar.bz2 7577 SHA256
9c9b68c28e67be281c9bcec5d944b2a3439bab953dce08fd35a65b10f9dae3cd SHA512
e649e334eec4deb7c261d808ed460413d78a2a4a672823d214c1e173a13bc314ce898fbf3674a7c7fe3151a089384ee0a7dee479bc8d005a06b65b39216bdf75
WHIRLPOOL
d7d9a80038fb939c26605d91eda9bc23070179bdf6ce597255c44f9d83f2603aae91d9890d2a445bce8c682708743021485f1415cea0b9b8f02dd9d982e36d3b
+DIST gcc-6.4.0.tar.xz 76156220 SHA256
850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4 SHA512
02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90
WHIRLPOOL
136b282c6957877d2f463d83740fa65a4e7a346ac94e4baabea25cec41ae307f34409b1e518a22927821d564b8634a48978dc8e1d0b988999e924adcbf3f5cc9
DIST gcc-7.1.0-patches-1.1.tar.bz2 6746 SHA256
39d4a0c659cc361bd3c71fdc9b793bccfa2bce06ede65ac49b805d1e236fcc8e SHA512
1bf95a505dc6c37bf6924bb69fd0670c8f3355b6690c94edf4a4248649accbd426575b40cb7a473dfb0ae09a924b05619e5c633384bae0293edb670cfd0d3a30
WHIRLPOOL
9682649fff62b56683637d25a58d11928342d99e52b2269f42369fd1d691208a7645802cb0d609ac30e20593ecdceb8cb1ab9b216963afe14db1b17ed43d5eb7
DIST gcc-7.1.0.tar.bz2 84303533 SHA256
8a8136c235f64c6fef69cac0d73a46a1a09bb250776a050aec8f9fc880bebc17 SHA512
b5d952be9a10f0e0926bb2868877d10544039d6d2f35ba0a08f51231dd622a007650764a03e173194701467547789ad7d2d9cbc10adcdf118d619cdedbd14aec
WHIRLPOOL
1dce5f89d4110bacd7f65140a1dee7b1a4898682e2ae8621832bda6f101354d226743acf77974b5e97d861c6eb6c47637138987dfb6ba222ad81b751e80ff6e6
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 1935 SHA256
82eb647e6cc5cb335983b40e78ebf3671e22835d34b6332ee671d20d6f318158 SHA512
bdf56782fe2845fe05ad2206d420ab65f6ebad06de997c713bf8f34d97d8bb4a1be97462846d9b31f033abf6ee4bbddd24d493433273b33ba3e772557d2a90b2
WHIRLPOOL
d24118954a322666913fdfa496c226f24e66811f1074fa6120525be891a4a057086fc898a237b6b570c9bad70e0407dcbe12ec54aad25deea856f9d2b11509a1
+EBUILD gcc-5.4.0-r3.ebuild 1934 SHA256
3d643e82c9ff1017c6ad6eb8a24994ffbbd48d70e30f0578fe4861ea60984c2d SHA512
620b95dbd9cd7b01538b8523af275b828d9f2db4760a5451a585be1cb39554d62a6ea2c0c6e3e5f7e97b82f20f8b1e18814ca82465b99a046313f98e31b1ab4a
WHIRLPOOL
72687c4950ee5e0567adf74b834d9639c4197245febcec50734093204b55f45aa0eb3f5535b79d848ab3f38b593e4850964130afa696ca41adb35793839023d6
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 603 SHA256
9cbff0ffd838af811cde3103906c146eaf17517caf48c8ad62a9216bbc435c8b SHA512
6dd72ba363429342fd12de1fcb677556b17d97cc98af1ac9c1feac76fd219d9e4fdc37b8838d28025d16a0179e85b21b159e24471d6ec1643d2c32fe09689543
WHIRLPOOL
a8718baf8b73fff11bc7f8bdcad69df6060e96838ca7e6b64651990084777dba9d9d59c6391518622981161495bbbcadc395138472b9551d69fed47d2897f65f
MISC metadata.xml 2282 SHA256
afee9279279d988491f12e47d474f13431cd28c871c5d78df367b6d3cac7e58c SHA512
a6b3c24ddf715f9c2db299a6d0f9caeabf2f3223b3d7ea61773cb53b4f2db2c470dbd18860532cad719409f91b9f438847f52cdb3b0d396e38e024f504a16940
WHIRLPOOL
f6d3f8a22a6e52290ffd7bc46b7e4a66519aa4dcc83d787024b636e9f5832dfd7eef891f2904c64fccdb10f33c87b8b18430e656a32a291ba2f928221c6e67cc
diff --git a/sys-devel/gcc/gcc-5.4.0-r3.ebuild
b/sys-devel/gcc/gcc-5.4.0-r3.ebuild
index c283487..c9a8b41 100644
--- a/sys-devel/gcc/gcc-5.4.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-5.4.0-r3.ebuild
@@ -23,7 +23,7 @@ SSP_MUSL_STABLE="amd64 arm ppc mips"
inherit epatch toolchain
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh
~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh
~sparc x86 ~amd64-fbsd ~x86-fbsd"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-6.4.0.ebuild b/sys-devel/gcc/gcc-6.4.0.ebuild
new file mode 100644
index 0000000..c23e915
--- /dev/null
+++ b/sys-devel/gcc/gcc-6.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.0"
+#UCLIBC_VER="1.0"
+
+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.13 )
+ >=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+ PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+fi
+
+src_prepare() {
+ toolchain_src_prepare
+
+ # Upstream Patch
+ epatch "${FILESDIR}"/${PN}-5.4.0-pr70473.patch
+
+ if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then
+ epatch "${FILESDIR}"/4.9.4/boehm_gc.patch
+ epatch "${FILESDIR}"/5.4.0/cilkrts.patch
+ epatch "${FILESDIR}"/6.3.0/cpu_indicator.patch
+ epatch "${FILESDIR}"/6.3.0/musl.patch
+ epatch "${FILESDIR}"/7.1.0/posix_memalign.patch
+ fi
+}
