commit: f30613f095df390a26accbfb62f923b0b5b5584d
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 17:44:13 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 18:22:29 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f30613f0
sys-libs/glibc: move 2.22 into ~arch
sys-libs/glibc/{glibc-2.22.ebuild => glibc-2.22-r1.ebuild} | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/sys-libs/glibc/glibc-2.22.ebuild
b/sys-libs/glibc/glibc-2.22-r1.ebuild
similarity index 92%
rename from sys-libs/glibc/glibc-2.22.ebuild
rename to sys-libs/glibc/glibc-2.22-r1.ebuild
index 7fba994..d6f6033 100644
--- a/sys-libs/glibc/glibc-2.22.ebuild
+++ b/sys-libs/glibc/glibc-2.22-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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,7 +155,7 @@ done
eblit-src_unpack-pre() {
[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack
gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
- # Bug 558636 we don't applY the pie works around for 2.22. It shoud
have the support.
+ # Bug 558636 we don't apply the pie works around for 2.22. It shoud
have the support. #558636
GLIBC_PATCH_EXCLUDE+="
00_all_0002-workaround-crash-when-handling-signals-in-static-PIE.patch"
GLIBC_PATCH_EXCLUDE+="
00_all_0012-disable-PIE-when-checking-for-PIC-default.patch"
}
@@ -164,11 +164,6 @@ eblit-src_prepare-post() {
cd "${S}"
if use hardened ; then
- # Bug 558636 we don't applY the pie works around for 2.22. It
shoud have the support.
- # einfo "Patching to get working PIE binaries on PIE (hardened)
platforms"
- # gcc-specs-pie && epatch
"${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
- # epatch
"${FILESDIR}"/2.20/glibc-2.20-hardened-inittls-nosysenter.patch
-
# We don't enable these for non-hardened as the output is very
terse --
# it only states that a crash happened. The default upstream
behavior
# includes backtraces and symbols.