summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2012-06-20 09:26:50 +0000
committerMichał Górny <mgorny@gentoo.org>2012-06-20 09:26:50 +0000
commitd97e0c2904a0a2613ad0d28d0838488af093944e (patch)
tree36197a559f28e77c2ceb4af91f36cbc375180e2e /eclass/eutils.eclass
parentmarked x86 per bug 422357 (diff)
downloadhistorical-d97e0c2904a0a2613ad0d28d0838488af093944e.tar.gz
historical-d97e0c2904a0a2613ad0d28d0838488af093944e.tar.bz2
historical-d97e0c2904a0a2613ad0d28d0838488af093944e.zip
prune_libtool_files(): report .a removal only if it exists, and explain the reasoning for it.
Diffstat (limited to 'eclass/eutils.eclass')
-rw-r--r--eclass/eutils.eclass8
1 files changed, 5 insertions, 3 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 116f7bc637df..eb8c8f77d107 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.399 2012/06/14 23:40:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.400 2012/06/20 09:26:50 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1438,8 +1438,10 @@ prune_libtool_files() {
# Remove static libs we're not supposed to link against.
if grep -q '^shouldnotlink=yes$' "${f}"; then
- einfo "Removing unnecessary ${archivefile#${D%/}}"
- rm -f "${archivefile}"
+ if [[ -f ${archivefile} ]]; then
+ einfo "Removing unnecessary ${archivefile#${D%/}} (static plugin)"
+ rm -f "${archivefile}"
+ fi
# The .la file may be used by a module loader, so avoid removing it
# unless explicitly requested.