diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-05-14 01:29:40 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-05-14 01:29:40 -0700 |
| commit | b4fba3e9fa2e285244de491f57700978158c1838 (patch) | |
| tree | 5f3fb2d3e3e04af36dc7074cf182243734bfcc88 | |
| parent | 2adc44295a5b5c77640c32cd24ebbd8d52e5237b (diff) | |
| download | portage-b4fba3e9fa2e285244de491f57700978158c1838.tar.gz portage-b4fba3e9fa2e285244de491f57700978158c1838.tar.bz2 portage-b4fba3e9fa2e285244de491f57700978158c1838.zip | |
prepstrip: disable parallel for splitdebug, etc..
| -rwxr-xr-x | 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 09b0333d9..a5b2cae8b 100755 --- a/bin/ebuild-helpers/prepstrip +++ b/bin/ebuild-helpers/prepstrip @@ -62,6 +62,20 @@ prepstrip_sources_dir=${EPREFIX}/usr/src/debug/${CATEGORY}/${PF} type -P debugedit >/dev/null && debugedit_found=true || debugedit_found=false debugedit_warned=false +disable_parallel=false +${FEATURES_splitdebug} && disable_parallel=true +${FEATURES_installsources} && \ + ! ${RESTRICT_installsources} && \ + ${debugedit_found} && disable_parallel=true + +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 unset ${!INODE_*} @@ -265,6 +279,9 @@ do multijob_post_fork done +# 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 |