diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-03-12 13:35:10 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-03-12 13:35:10 +0000 |
| commit | 4fc29a94c262d6f8e8a18abdc67f72b938620ad4 (patch) | |
| tree | d80f13b49b4d834dacadba7fb85a50a9aa50246b /sys-libs/glibc | |
| parent | Install the systemd files from upstream with glibc-2.19+. (diff) | |
| download | gentoo-2-4fc29a94c262d6f8e8a18abdc67f72b938620ad4.tar.gz gentoo-2-4fc29a94c262d6f8e8a18abdc67f72b938620ad4.tar.bz2 gentoo-2-4fc29a94c262d6f8e8a18abdc67f72b938620ad4.zip | |
Sync with glibc-2.19 ebuild.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-9999.ebuild | 18 |
2 files changed, 13 insertions, 10 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 4421bfadff48..97646e75e19b 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.984 2014/03/12 13:34:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.985 2014/03/12 13:35:10 vapier Exp $ + + 12 Mar 2014; Mike Frysinger <vapier@gentoo.org> glibc-9999.ebuild: + Sync with glibc-2.19 ebuild. 12 Mar 2014; Mike Frysinger <vapier@gentoo.org> files/eblits/src_install.eblit: diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 9d1915027ff5..e393645aad15 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.21 2013/04/10 16:40:27 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.22 2014/03/12 13:35:10 vapier Exp $ -inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing +inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing DESCRIPTION="GNU libc6 (also called glibc2) C library" HOMEPAGE="http://www.gnu.org/software/libc/libc.html" LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" -#KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +#KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" RESTRICT="strip" # strip ourself #46186 EMULTILIB_PKG="true" @@ -155,14 +155,14 @@ eblit-src_unpack-post() { if use hardened ; then cd "${S}" einfo "Patching to get working PIE binaries on PIE (hardened) platforms" - gcc-specs-pie && epatch "${FILESDIR}"/2.16/glibc-2.16-hardened-pie.patch - epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch - epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch + gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch + epatch "${FILESDIR}"/2.19/glibc-2.19-hardened-configure-picdefault.patch + epatch "${FILESDIR}"/2.18/glibc-2.18-hardened-inittls-nosysenter.patch einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" - cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \ + cp -f "${FILESDIR}"/2.18/glibc-2.18-gentoo-stack_chk_fail.c \ debug/stack_chk_fail.c || die - cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \ + cp -f "${FILESDIR}"/2.18/glibc-2.18-gentoo-chk_fail.c \ debug/chk_fail.c || die if use debug ; then |