commit: 02914d4a1d331d8fc07842d92b79cfb2cce2275e
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 18:35:45 2015 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 18:35:45 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02914d4a
sys-libs/glibc: Use built-in pie support on 2.22 #558636
Package-Manager: portage-2.2.22
sys-libs/glibc/glibc-2.22.ebuild | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/sys-libs/glibc/glibc-2.22.ebuild b/sys-libs/glibc/glibc-2.22.ebuild
index a706597..baa1223 100644
--- a/sys-libs/glibc/glibc-2.22.ebuild
+++ b/sys-libs/glibc/glibc-2.22.ebuild
@@ -155,15 +155,20 @@ 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.
+ GLIBC_PATCH_EXCLUDE+="
00_all_0002-workaround-crash-when-handling-signals-in-static-PIE.patch"
+ GLIBC_PATCH_EXCLUDE+=" 00_all_0009-arm-fix-PIC-vs-SHARED-typos.patch"
+ GLIBC_PATCH_EXCLUDE+="
00_all_0012-disable-PIE-when-checking-for-PIC-default.patch"
}
eblit-src_prepare-post() {
cd "${S}"
if use hardened ; then
- 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
+ # 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
