From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1STqfJ-0001OG-DO for garchives@archives.gentoo.org; Mon, 14 May 2012 08:30:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6DC9EE05EF; Mon, 14 May 2012 08:29:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 40F8EE05EF for ; Mon, 14 May 2012 08:29:54 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B16111B4124 for ; Mon, 14 May 2012 08:29:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 76EECE5429 for ; Mon, 14 May 2012 08:29:52 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1336984180.b4fba3e9fa2e285244de491f57700978158c1838.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild-helpers/prepstrip X-VCS-Directories: bin/ebuild-helpers/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: b4fba3e9fa2e285244de491f57700978158c1838 X-VCS-Branch: master Date: Mon, 14 May 2012 08:29:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: aa6c2dee-a4d9-4927-81e0-f27a8c996176 X-Archives-Hash: 84465610e499198503f9709f7fa74df4 commit: b4fba3e9fa2e285244de491f57700978158c1838 Author: Zac Medico gentoo org> AuthorDate: Mon May 14 08:29:40 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon May 14 08:29:40 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Db4fba3e9 prepstrip: disable parallel for splitdebug, etc.. --- bin/ebuild-helpers/prepstrip | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip index 09b0333..a5b2cae 100755 --- a/bin/ebuild-helpers/prepstrip +++ b/bin/ebuild-helpers/prepstrip @@ -62,6 +62,20 @@ prepstrip_sources_dir=3D${EPREFIX}/usr/src/debug/${CAT= EGORY}/${PF} type -P debugedit >/dev/null && debugedit_found=3Dtrue || debugedit_foun= d=3Dfalse debugedit_warned=3Dfalse =20 +disable_parallel=3Dfalse +${FEATURES_splitdebug} && disable_parallel=3Dtrue +${FEATURES_installsources} && \ + ! ${RESTRICT_installsources} && \ + ${debugedit_found} && disable_parallel=3Dtrue + +if ${disable_parallel} ; then + # Disable parallel processing, in order to prevent interference with + # temp files like debug.sources or prepstrip.split.debug + numjobs() { + echo 1 + } +fi + multijob_init =20 unset ${!INODE_*} @@ -265,6 +279,9 @@ do multijob_post_fork done =20 +# Let jobs finish before processing ${T}/debug.sources +multijob_finish + if [[ -s ${T}/debug.sources ]] && \ ${FEATURES_installsources} && \ ! ${RESTRICT_installsources} && \ @@ -284,5 +301,3 @@ then >> "$emptydir"/.keepdir done < <(find "${D}${prepstrip_sources_dir}/" -type d -empty -print0) fi - -multijob_finish