From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 037FE138010 for ; Thu, 11 Oct 2012 16:51:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35B49E04BA; Thu, 11 Oct 2012 16:50:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A516CE04BA for ; Thu, 11 Oct 2012 16:50:55 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E9AA733D791 for ; Thu, 11 Oct 2012 16:50:54 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id B367F21600; Thu, 11 Oct 2012 16:50:53 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog eutils.eclass X-VCS-Directories: eclass X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20121011165053.B367F21600@flycatcher.gentoo.org> Date: Thu, 11 Oct 2012 16:50:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 01fc2258-dc3d-4fee-ac5b-11b6eece5123 X-Archives-Hash: 65148ba638c509bed75c0b29abfc0dc0 mgorny 12/10/11 16:50:53 Modified: ChangeLog eutils.eclass Log: prune_libtool_files(): fix removing symlinked .la files. Revision Changes Path 1.436 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.436&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.436&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.435&r2=1.436 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.435 retrieving revision 1.436 diff -u -r1.435 -r1.436 --- ChangeLog 11 Oct 2012 10:51:41 -0000 1.435 +++ ChangeLog 11 Oct 2012 16:50:53 -0000 1.436 @@ -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.435 2012/10/11 10:51:41 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.436 2012/10/11 16:50:53 mgorny Exp $ + + 11 Oct 2012; Michał Górny eutils.eclass: + prune_libtool_files(): fix removing symlinked .la files. 08 Oct 2012; Michał Górny +autotools-multilib.eclass: Introduce autotools-multilib, to simplify building multilib packages with 1.407 eclass/eutils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.407&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.407&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.406&r2=1.407 Index: eutils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v retrieving revision 1.406 retrieving revision 1.407 diff -u -r1.406 -r1.407 --- eutils.eclass 7 Oct 2012 06:22:01 -0000 1.406 +++ eutils.eclass 11 Oct 2012 16:50:53 -0000 1.407 @@ -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.406 2012/10/07 06:22:01 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.407 2012/10/11 16:50:53 mgorny Exp $ # @ECLASS: eutils.eclass # @MAINTAINER: @@ -1414,6 +1414,7 @@ done local f + local queue=() while IFS= read -r -d '' f; do # for all .la files local archivefile=${f/%.la/.a} @@ -1423,7 +1424,7 @@ if grep -q '^shouldnotlink=yes$' "${f}"; then if [[ -f ${archivefile} ]]; then einfo "Removing unnecessary ${archivefile#${D%/}} (static plugin)" - rm -f "${archivefile}" + queue+=( "${archivefile}" ) fi # The .la file may be used by a module loader, so avoid removing it @@ -1474,9 +1475,13 @@ if [[ ${reason} ]]; then einfo "Removing unnecessary ${f#${D%/}} (${reason})" - rm -f "${f}" + queue+=( "${f}" ) fi - done < <(find "${D}" -type f -name '*.la' -print0) + done < <(find "${D}" -xtype f -name '*.la' -print0) + + if [[ ${queue[@]} ]]; then + rm -f "${queue[@]}" + fi } check_license() { die "you no longer need this as portage supports ACCEPT_LICENSE itself"; }