commit:     780a9add5d2a0bef127307b6cbba7ca8e54beaba
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 23 21:31:05 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Sep 23 22:35:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=780a9add

sys-devel/gcc: cut 1.5 patchset for 4.7.4

Two new patches and two updates:
+ 34_all_libjava-classpath-locale-sort.patch
  fix sortting on cs_CZ locale
+ 95_all_ucontext-to-ucontext_t.patch
  fix build failure against glibc-2.28

Bug: https://bugs.gentoo.org/629502
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 sys-devel/gcc/Manifest            |  1 +
 sys-devel/gcc/gcc-4.7.4-r2.ebuild | 47 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 5b08a01be38..dec18ca9b1b 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -33,6 +33,7 @@ DIST gcc-4.6.4-patches-1.3.tar.bz2 16443 BLAKE2B 
a6d5cb1b51319e3167f687b7efddffd
 DIST gcc-4.6.4-uclibc-patches-1.0.tar.bz2 3010 BLAKE2B 
e841db5125638b0ec34323d0500786ab6577042a22af3b423433542164408199ac4ff1036d27999aa01aa96e9e50988df2e86835102142f74c3f8fb33096a47e
 SHA512 
fd289089a30c768b0ec4e3459cf494bc5e9d4ecf87056dc183277c712f7d69ac4cf900950270d8eacfe686b4aa906e1ece87cae52f2cb00642e96c0b95dcf133
 DIST gcc-4.6.4.tar.bz2 72006076 BLAKE2B 
321c14c097c18cf60c32d228720980717e25e22e26ce5e75c3a411c423f9657eb896974200664132e2fb10c3010c5136d2da7f3c916fffddf7e4afe4e8bfdc20
 SHA512 
b5a5395782e0b9e61cda052f6e00c8575d1aa0b7e8db9e34c06e4e45f12ff37b436018536b7fa69a04a4235b5b368895652e3ed8fab2fe11763f9782ed9161dc
 DIST gcc-4.7.4-patches-1.4.tar.bz2 18072 BLAKE2B 
6bab25aee9f9ef605ce2942928a9d1aa91371b8fdec00643805e5010a4b0ffb043e0dd1a119d1064f79e499983374ed39e475a9718fce632cad07811363ed56b
 SHA512 
9f5d68ba62aee909023542dcece81e4e448ea750254258107d4f70291d8ae99469c4518e42ffddbe6b622b258f463127be6e6ef7eaaeeeb0f59b3b719f3eadca
+DIST gcc-4.7.4-patches-1.5.tar.bz2 20193 BLAKE2B 
56c6258ee7c8c5657161e8eb182364b862d536300dbbb6ed7e781b45456a265debd299dc16496a543a291313af4d2cfd5f17a842abf64ebc3635d6b50458e4ae
 SHA512 
340dea0cb11c676b5936ad1a32317987cd3a9b3271cf99bd50e40be39d5d361a218f4312deb2a6a17c6ae1fc7fd229b718857fde0e303b3537a4b89ba918c8d3
 DIST gcc-4.7.4-piepatches-v0.5.5.tar.bz2 15358 BLAKE2B 
e0df0b19829d9f9b1e8719467a6e15336d58ccf50c182c3d14438bc7e8690940535f6391b83f359c4e0bedf16814b7d4e2b0888f4698740be511bf6a574f9556
 SHA512 
f5e078bf4c17f7b5be102f1e3358d91c72e80363b5e055a92461f78399a1bf27bf6cb690d41900719bb260b6529f5d1aac999e613fda6ac5e4efa27f622510e6
 DIST gcc-4.7.4-uclibc-patches-1.0.tar.bz2 3019 BLAKE2B 
b24522bd5516e0f2bb4e8d20437e0a0aed22ea8cae3c78fc600688f71a57bb7fbd3d431737a30e4406a9ff5426ed7d2289b3efac4d5efaa5841f7db290ef023c
 SHA512 
c2e6c96b74365f8233f6106fa03d94075b60f6f77c683aa2e27aceb007da723243f8e3ddea8b178e6a0f7939b8e35615165534dc74e5050f87680ab261a31c52
 DIST gcc-4.7.4.tar.bz2 82935453 BLAKE2B 
98cc902dd1506161b96c8eba10e5a5c7fb11d2dfd95ebac15825806fcdb262a1ff962b72275dcfc8453b753164fc234bdd666b207202cfd5a0a2b4cd09b8c741
 SHA512 
dfcb737073191e628231031a3571ec77ee760a59377630f4a6e4fdfa66f9ddad39fde47e3f0f227eb43cdf90e0d34cde5abdc9ac892c1e111a911062a66c9189

diff --git a/sys-devel/gcc/gcc-4.7.4-r2.ebuild 
b/sys-devel/gcc/gcc-4.7.4-r2.ebuild
new file mode 100644
index 00000000000..6367a6297c7
--- /dev/null
+++ b/sys-devel/gcc/gcc-4.7.4-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.5"
+UCLIBC_VER="1.0"
+
+# Hardened gcc 4 stuff
+PIE_VER="0.5.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 ppc ppc64 arm ia64"
+PIE_UCLIBC_STABLE="x86 arm amd64 ppc ppc64"
+SSP_STABLE="amd64 x86 ppc ppc64 arm"
+# uclibc need tls and nptl support for SSP support
+# uclibc need to be >= 0.9.33
+SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
+#end Hardened stuff
+
+inherit eutils toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~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.18"
+
+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
+
+       toolchain_src_prepare
+
+       use vanilla && return 0
+
+       [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
+}

Reply via email to