diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-06-20 09:26:50 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-06-20 09:26:50 +0000 |
| commit | 19bb29237d955c038992c761c05ab1891f799374 (patch) | |
| tree | 7e594ec232f420fee42d7f09a7d2af79a818c3e0 | |
| parent | marked x86 per bug 422357 (diff) | |
| download | gentoo-2-19bb29237d955c038992c761c05ab1891f799374.tar.gz gentoo-2-19bb29237d955c038992c761c05ab1891f799374.tar.bz2 gentoo-2-19bb29237d955c038992c761c05ab1891f799374.zip | |
prune_libtool_files(): report .a removal only if it exists, and explain the reasoning for it.
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/eutils.eclass | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 79e20a63068c..8e8f899ed0c0 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.320 2012/06/20 08:49:27 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.321 2012/06/20 09:26:50 mgorny Exp $ + + 20 Jun 2012; Michał Górny <mgorny@gentoo.org> eutils.eclass: + prune_libtool_files(): report .a removal only if it exists, and explain the + reasoning for it. 20 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> gst-plugins-bad.eclass: Fix building with newer eapis wrt bug#385841. Noticed by triggered rebuild to 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. |