some minor code fixes

svn path=/main/trunk/; revision=9996

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index c5952926a3ac2de14979b20a1f2bd197e2ab634d..995ec0b371c69a2bf0523624fa1efbc76b4799d4 100755 (executable)
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -159,11 +159,11 @@ install_qa_check() {
                fi
 
                # Save NEEDED information after removing self-contained providers
-               scanelf -qyRF '%a;%p;%S;%r;%n' "${D}" | { while read l; do
+               scanelf -qyRF '%a;%p;%S;%r;%n' "${D}" | { while IFS= read l; do
                        arch=${l%%;*}; l=${l#*;}
                        obj="/${l%%;*}"; l=${l#*;}
                        soname=${l%%;*}; l=${l#*;}
-                       rpath=${l%%;*}; l=${l#*;}; [ "${rpath}" == "  -  " ] && rpath=""
+                       rpath=${l%%;*}; l=${l#*;}; [ "${rpath}" = "  -  " ] && rpath=""
                        needed=${l%%;*}; l=${l#*;}
                        if [ -z "${rpath}" -o -n "${rpath//*ORIGIN*}" ]; then
                                # object doesn't contain $ORIGIN in its runpath attribute
@@ -181,7 +181,7 @@ install_qa_check() {
                                rneeded=${rneeded:1}
                                if [ -n "${rneeded}" ]; then
                                        echo "${obj} ${rneeded}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED
-                                       echo "${arch:3};/${obj};${soname};${rpath};${rneeded}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED.2
+                                       echo "${arch:3};${obj};${soname};${rpath};${rneeded}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED.2
                                fi
                        fi
                done }