Variables work pretty bad between subshells, so use a file instead

svn path=/main/branches/prefix/; revision=9271

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 2f4f6e4269f98125092fa8cc4314e9e9e7b58348..2eec3579a069eb2c8fd1444dbcc97b5ccaf6ec81 100644 (file)
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -341,7 +341,7 @@ install_qa_check() {
        # together with the scan for broken installs.
        rm -f "${T}"/.install_name_check_failed
        [[ ${CHOST} == *-darwin* ]] && find "${ED}" -type f | while read f ; do
-               needed=""
+               rm -f "${T}"/.NEEDED.tmp
                otool -LX "${f}" \
                        | grep -v "Archive : " \
                        | sed -e 's/^\t//' -e 's/ (compa.*$//' \
@@ -364,10 +364,12 @@ install_qa_check() {
                                        touch "${T}"/.install_name_check_failed
                                fi
                        fi
-                       needed=${needed}${needed:+,}${r}
+                       echo -n ",${r}" >> "${T}"/.NEEDED.tmp
                done
-               [[ -n ${needed} ]] && \
-                       echo "/${f#${D}} ${needed}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED
+               if [[ -f "${T}"/.NEEDED.tmp ]] ; then
+                       needed=$(< "${T}"/.NEEDED.tmp)
+                       echo "/${f#${D}} ${needed#,}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED
+               fi
        done
        if [[ -f ${T}/.install_name_check_failed ]] ; then
                # secret switch "allow_broken_install_names" to get