diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-12-14 16:42:46 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-12-14 16:42:46 +0000 |
| commit | 8b3fc6b8079b4fba9e147f1b04117722ecb9e115 (patch) | |
| tree | d4452b660f83c0c0eafbab9574b0ba54e8b9e136 /sys-libs | |
| parent | Stable for AMD64, wrt bug #391481 (diff) | |
| download | gentoo-2-8b3fc6b8079b4fba9e147f1b04117722ecb9e115.tar.gz gentoo-2-8b3fc6b8079b4fba9e147f1b04117722ecb9e115.tar.bz2 gentoo-2-8b3fc6b8079b4fba9e147f1b04117722ecb9e115.zip | |
Also filter out glibc binaries when looking for __guard #394453#5 by Michael Haubenwallner.
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/pkg_setup.eblit | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 002195beb8f8..19faae33919d 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.807 2011/12/12 23:22:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.808 2011/12/14 16:42:46 vapier Exp $ + + 14 Dec 2011; Mike Frysinger <vapier@gentoo.org> files/eblits/pkg_setup.eblit: + Also filter out glibc binaries when looking for __guard #394453#5 by Michael + Haubenwallner. 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 diff --git a/sys-libs/glibc/files/eblits/pkg_setup.eblit b/sys-libs/glibc/files/eblits/pkg_setup.eblit index 8b712537b77b..640fce341c76 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.9 2011/12/12 23:22:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.10 2011/12/14 16:42:46 vapier Exp $ glibc_compile_test() { local ret save_cflags=${CFLAGS} @@ -107,9 +107,9 @@ eblit-glibc-pkg_setup() { "${ROOT}"/lib* \ "${ROOT}"/usr/*bin/ \ "${ROOT}"/usr/lib* | \ - grep -v \ - -e "^${ROOT}/lib.*/libc-2.*.so$" \ - -e "^${ROOT}/lib.*/ld-2.*.so$" + egrep -v \ + -e "^${ROOT}/lib.*/(libc|ld)-2.*.so$" \ + -e "^${ROOT}/sbin/(ldconfig|sln)$" ) [[ -z ${files} ]] if ! eend $? ; then |