diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-05-11 11:10:31 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-05-11 11:10:31 +0000 |
| commit | 601e6f577f11d0fd61f3b32ba714e88353b46372 (patch) | |
| tree | abf5abb2a8b291bd574d41a7265ec2c632564997 /eclass/libtool.eclass | |
| parent | stable on amd64 wrt security bug #91862 (diff) | |
| download | historical-601e6f577f11d0fd61f3b32ba714e88353b46372.tar.gz historical-601e6f577f11d0fd61f3b32ba714e88353b46372.tar.bz2 historical-601e6f577f11d0fd61f3b32ba714e88353b46372.zip | |
Do not run libtoolize if portage patch already applied.
Diffstat (limited to 'eclass/libtool.eclass')
| -rw-r--r-- | eclass/libtool.eclass | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass index a23e8ad76d58..680a5fb7de7c 100644 --- a/eclass/libtool.eclass +++ b/eclass/libtool.eclass @@ -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/eclass/libtool.eclass,v 1.44 2005/03/23 18:03:21 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.45 2005/05/11 11:10:31 azarah Exp $ # # Author: Martin Schlemmer <azarah@gentoo.org> # @@ -227,8 +227,16 @@ elibtoolize() { die "Portage patch requested, but failed to apply!" fi else - ewarn " Could not apply portage.patch!" - ewarn " Please verify that it is not needed." + if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then + ewarn " Portage patch seems to be already applied." + ewarn " Please verify that it is not needed." + else + echo + eerror "Portage patch failed to apply!" + die "Portage patch failed to apply!" + fi + # We do not want to run libtoolize ... + ELT_APPLIED_PATCHES="portage" fi ;; esac |