diff options
author | Mike Frysinger <vapier@gentoo.org> | 2012-05-14 13:35:46 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2012-05-14 14:51:05 -0400 |
commit | 235c122ae35ebf965f2effd31a4b830195ceb0dd (patch) | |
tree | 61df9ecd642c539e5dc6c78f2b6d8e9d7665eadc | |
parent | 22795b488b882aa423e6bc330a81820f41ec0eb9 (diff) | |
download | portage-235c122ae35ebf965f2effd31a4b830195ceb0dd.tar.gz portage-235c122ae35ebf965f2effd31a4b830195ceb0dd.tar.bz2 portage-235c122ae35ebf965f2effd31a4b830195ceb0dd.zip |
prepstrip: run the log parsing in parallel to file stripping
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rwxr-xr-x | bin/ebuild-helpers/prepstrip | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip index 063a17c89..c5b1785a3 100755 --- a/bin/ebuild-helpers/prepstrip +++ b/bin/ebuild-helpers/prepstrip @@ -187,12 +187,15 @@ process_elf() { # We want to log already stripped binaries, as this may be a QA violation. # They prevent us from getting the splitdebug data. if ! ${RESTRICT_binchecks} && ! ${RESTRICT_strip} ; then + # We need to do the non-stripped scan serially first before we turn around + # and start stripping the files ourselves. The log parsing can be done in + # parallel though. + log=$T/scanelf-already-stripped.log + scanelf -yqRBF '#k%F' -k '!.symtab' "$@" | sed -e "s#^${ED}##" > "$log" ( multijob_child_init - log=$T/scanelf-already-stripped.log qa_var="QA_PRESTRIPPED_${ARCH/-/_}" [[ -n ${!qa_var} ]] && QA_PRESTRIPPED="${!qa_var}" - scanelf -yqRBF '#k%F' -k '!.symtab' "$@" | sed -e "s#^${ED}##" > "$log" if [[ -n $QA_PRESTRIPPED && -s $log && \ ${QA_STRICT_PRESTRIPPED-unset} = unset ]] ; then shopts=$- @@ -215,9 +218,6 @@ if ! ${RESTRICT_binchecks} && ! ${RESTRICT_strip} ; then multijob_post_fork fi -# Let the Pre-stripped check finish before we start stripping -multijob_finish - # Now we look for unstripped binaries. for x in \ $(scanelf -yqRBF '#k%F' -k '.symtab' "$@") \ |