[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     60dd63db42211dbbd67908fca13d196ec38dad3a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 12 10:50:34 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 07:33:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60dd63db

eutils.eclass: prune_libtool_files, punt pointless Prefix logic

Remove the unnecessary Prefix logic from prune_libtool_files(). There is
no functional difference between starting a find in ${D} and ${ED}
(since ${D} is not supposed to contain other directories on a Prefix
system), and using the latter implies unnecessary hackery for older
EAPIs.

 eclass/eutils.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index e036001dc5e..ab226b236a3 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -898,7 +898,6 @@ prune_libtool_files() {
        debug-print-function ${FUNCNAME} "$@"
 
        local removing_all removing_modules opt
-       _eutils_eprefix_init
        for opt; do
                case "${opt}" in
                        --all)
@@ -1008,7 +1007,7 @@ prune_libtool_files() {
                        einfo "Removing unnecessary ${f#${D%/}} (${reason})"
                        queue+=( "${f}" )
                fi
-       done < <(find "${ED}" -xtype f -name '*.la' -print0)
+       done < <(find "${D}" -xtype f -name '*.la' -print0)
 
        if [[ ${queue[@]} ]]; then
                rm -f "${queue[@]}"