diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-10-23 21:09:39 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-10-23 21:09:39 +0000 |
| commit | 588165fd126bff15a3eafd04f04488df30034029 (patch) | |
| tree | 2fd57c307577affda651906279ec149bc441bc71 /eclass | |
| parent | Improve documentation and a few minor fixes. (diff) | |
| download | gentoo-2-588165fd126bff15a3eafd04f04488df30034029.tar.gz gentoo-2-588165fd126bff15a3eafd04f04488df30034029.tar.bz2 gentoo-2-588165fd126bff15a3eafd04f04488df30034029.zip | |
prune_libtool_files(): fix variable reuse. Thanks to radhermit for the patch.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/eutils.eclass | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 766960adf222..315daca6ac34 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.461 2012/10/23 20:58:05 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.462 2012/10/23 21:09:39 mgorny Exp $ + + 23 Oct 2012; Michał Górny <mgorny@gentoo.org> eutils.eclass: + prune_libtool_files(): fix variable reuse. Thanks to radhermit for the patch. 23 Oct 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass, python-r1.eclass: diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 451fef3a9a1b..658879271335 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.408 2012/10/11 16:52:05 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.409 2012/10/23 21:09:39 mgorny Exp $ # @ECLASS: eutils.eclass # @MAINTAINER: @@ -1462,14 +1462,14 @@ prune_libtool_files() { # Create a list of all .pc-covered libs. local pc_libs=() if [[ ! ${removing_all} ]]; then - local f + local pc local tf=${T}/prune-lt-files.pc local pkgconf=$(tc-getPKG_CONFIG) - while IFS= read -r -d '' f; do # for all .pc files + while IFS= read -r -d '' pc; do # for all .pc files local arg - sed -e '/^Requires:/d' "${f}" > "${tf}" + sed -e '/^Requires:/d' "${pc}" > "${tf}" for arg in $("${pkgconf}" --libs "${tf}"); do [[ ${arg} == -l* ]] && pc_libs+=( lib${arg#-l}.la ) done |