diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-12-12 23:22:33 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-12-12 23:22:33 +0000 |
| commit | 1b417345ac50d1ee9b5d190820509f5211743d24 (patch) | |
| tree | d27e6cd0e99c943a94b7279e98998bf0882c780a /sys-libs/glibc | |
| parent | Version bump. (diff) | |
| download | gentoo-2-1b417345ac50d1ee9b5d190820509f5211743d24.tar.gz gentoo-2-1b417345ac50d1ee9b5d190820509f5211743d24.tar.bz2 gentoo-2-1b417345ac50d1ee9b5d190820509f5211743d24.zip | |
Reduce the scope of the __guard checking, and filter out more files w/ROOT #394453#3 by Andrea Zuccherelli.
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/pkg_setup.eblit | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index a1a2e06dd5f9..002195beb8f8 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.806 2011/12/12 17:47:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.807 2011/12/12 23:22:33 vapier Exp $ + + 12 Dec 2011; Mike Frysinger <vapier@gentoo.org> files/eblits/pkg_setup.eblit: + Reduce the scope of the __guard checking, and filter out more files w/ROOT + #394453#3 by Andrea Zuccherelli. 12 Dec 2011; Mike Frysinger <vapier@gentoo.org> files/eblits/pkg_setup.eblit, files/eblits/src_compile.eblit, files/eblits/src_unpack.eblit: diff --git a/sys-libs/glibc/files/eblits/pkg_setup.eblit b/sys-libs/glibc/files/eblits/pkg_setup.eblit index 31a38f437716..8b712537b77b 100644 --- a/sys-libs/glibc/files/eblits/pkg_setup.eblit +++ b/sys-libs/glibc/files/eblits/pkg_setup.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.8 2011/12/12 17:47:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.9 2011/12/12 23:22:33 vapier Exp $ glibc_compile_test() { local ret save_cflags=${CFLAGS} @@ -97,7 +97,9 @@ eblit-glibc-pkg_setup() { ewarn "PIE hardening not applied, as your compiler doesn't default to PIE" # Make sure host system is up to date #394453 - if has_version '<sys-libs/glibc-2.15' ; then + if has_version '<sys-libs/glibc-2.13' && \ + [[ -n $(scanelf -qys__guard -F'#s%F' "${ROOT}"/lib*/l*-*.so) ]] + then ebegin "Scanning system for __guard to see if you need to rebuild first ..." local files=$( scanelf -qys__guard -F'#s%F' \ @@ -105,7 +107,9 @@ eblit-glibc-pkg_setup() { "${ROOT}"/lib* \ "${ROOT}"/usr/*bin/ \ "${ROOT}"/usr/lib* | \ - grep -v '^/lib.*/libc-2.*.so$' + grep -v \ + -e "^${ROOT}/lib.*/libc-2.*.so$" \ + -e "^${ROOT}/lib.*/ld-2.*.so$" ) [[ -z ${files} ]] if ! eend $? ; then |