summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Granberg <zorry@gentoo.org>2015-10-12 20:35:45 +0200
committerMagnus Granberg <zorry@gentoo.org>2015-10-12 20:35:45 +0200
commit02914d4a1d331d8fc07842d92b79cfb2cce2275e (patch)
treee1029fd90016f563605038403bf360f37e613c59 /sys-libs
parentsys-devel/gdb: force disable guile for now #562902 (diff)
downloadgentoo-02914d4a1d331d8fc07842d92b79cfb2cce2275e.tar.gz
gentoo-02914d4a1d331d8fc07842d92b79cfb2cce2275e.tar.bz2
gentoo-02914d4a1d331d8fc07842d92b79cfb2cce2275e.zip
sys-libs/glibc: Use built-in pie support on 2.22 #558636
Package-Manager: portage-2.2.22
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/glibc/glibc-2.22.ebuild11
1 files changed, 8 insertions, 3 deletions
diff --git a/sys-libs/glibc/glibc-2.22.ebuild b/sys-libs/glibc/glibc-2.22.ebuild
index a706597d650c..baa1223a5c93 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