summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2005-03-13 21:43:18 +0000
committerMartin Schlemmer <azarah@gentoo.org>2005-03-13 21:43:18 +0000
commitc9a279b6481e4eb0e3510c2cb5b8b8014e9b8e68 (patch)
tree7073be2ad1c66c540af4a342055cc8f322a55d30 /sys-libs
parentAdding patch for gcc 3.4 supplied in bug #84579 (diff)
downloadgentoo-2-c9a279b6481e4eb0e3510c2cb5b8b8014e9b8e68.tar.gz
gentoo-2-c9a279b6481e4eb0e3510c2cb5b8b8014e9b8e68.tar.bz2
gentoo-2-c9a279b6481e4eb0e3510c2cb5b8b8014e9b8e68.zip
Tweak dependency test to hopefully fix bug #84836
(Portage version: 2.0.51.19)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/pam/ChangeLog5
-rw-r--r--sys-libs/pam/pam-0.78-r2.ebuild7
2 files changed, 8 insertions, 4 deletions
diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index dee597db38b7..c796d1ad44a0 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/pam
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.67 2005/03/09 23:57:04 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.68 2005/03/13 21:43:18 azarah Exp $
+
+ 13 Mar 2005; Martin Schlemmer <azarah@gentoo.org> pam-0.78-r2.ebuild:
+ Tweak dependency test to hopefully fix bug #84836
09 Mar 2005; Martin Schlemmer <azarah@gentoo.org> pam-0.78-r2.ebuild:
Do not check for gcc dir when we check if modules are link to libs in /usr.
diff --git a/sys-libs/pam/pam-0.78-r2.ebuild b/sys-libs/pam/pam-0.78-r2.ebuild
index a9cf2b352cfc..cc052bea9bab 100644
--- a/sys-libs/pam/pam-0.78-r2.ebuild
+++ b/sys-libs/pam/pam-0.78-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.78-r2.ebuild,v 1.2 2005/03/09 23:57:04 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.78-r2.ebuild,v 1.3 2005/03/13 21:43:18 azarah Exp $
FORCE_SYSTEMAUTH_UPDATE="no"
@@ -290,8 +290,9 @@ src_install() {
echo
die "${mod_name} module did not build."
fi
- if [[ -n $(ldd "${sec_dir}/${mod_name}"*.so 2>&1 | grep '/usr/' | \
- grep -v 'usr/$(get_libdir)/gcc') ]] ; then
+ if [[ -n $(ldd "${sec_dir}/${mod_name}"*.so 2>&1 | \
+ grep "/usr/$(get_libdir)/" | \
+ grep -v "/usr/$(get_libdir)/gcc") ]] ; then
echo
eerror "ERROR: ${mod_name} have dependencies in /usr."
echo