summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2005-05-11 15:15:03 +0000
committerMartin Schlemmer <azarah@gentoo.org>2005-05-11 15:15:03 +0000
commita32d137e6bc49fe7a2768d1be94144cba38d080e (patch)
treefb23fa55574aa2f709cc0114052aa00e1e49cdbd /eclass/libtool.eclass
parentBump to stable (diff)
downloadhistorical-a32d137e6bc49fe7a2768d1be94144cba38d080e.tar.gz
historical-a32d137e6bc49fe7a2768d1be94144cba38d080e.tar.bz2
historical-a32d137e6bc49fe7a2768d1be94144cba38d080e.zip
Add ltmain.sh version to error if we abort on portage patch.
Diffstat (limited to 'eclass/libtool.eclass')
-rw-r--r--eclass/libtool.eclass8
1 files changed, 6 insertions, 2 deletions
diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass
index 680a5fb7de7c..66314eac9722 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.45 2005/05/11 11:10:31 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.46 2005/05/11 15:15:03 azarah Exp $
#
# Author: Martin Schlemmer <azarah@gentoo.org>
#
@@ -231,8 +231,12 @@ elibtoolize() {
ewarn " Portage patch seems to be already applied."
ewarn " Please verify that it is not needed."
else
+ local version=$( \
+ eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
+ echo "${VERSION}")
+
echo
- eerror "Portage patch failed to apply!"
+ eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
die "Portage patch failed to apply!"
fi
# We do not want to run libtoolize ...