summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2008-04-25 03:39:58 +0000
committerMarius Mauch <genone@gentoo.org>2008-04-25 03:39:58 +0000
commitfe826380797ea035ac2778fa03149ac7b5e89b18 (patch)
tree473a0c4383fd09178984b4e49e6610a540f5af82 /bin
parentAdd some more spinner.update() calls in possibly time consuming loops. (diff)
downloadportage-multirepo-fe826380797ea035ac2778fa03149ac7b5e89b18.tar.gz
portage-multirepo-fe826380797ea035ac2778fa03149ac7b5e89b18.tar.bz2
portage-multirepo-fe826380797ea035ac2778fa03149ac7b5e89b18.zip
as NEEDED files don't conain enough formation for e.g. preserve-libsto work properly and we don't want to change the format of existing files create another file including additional information
svn path=/main/trunk/; revision=9970
Diffstat (limited to 'bin')
-rwxr-xr-xbin/misc-functions.sh16
1 files changed, 11 insertions, 5 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 41b38e5a..c5952926 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -159,13 +159,16 @@ install_qa_check() {
fi
# Save NEEDED information after removing self-contained providers
- scanelf -qyRF '%p:%r %n' "${D}" | sed -e 's:^:/:' | { while read l; do
- obj=${l%%:*}
- rpath=${l##*:}; rpath=${rpath%% *}
- needed=${l##* }
+ scanelf -qyRF '%a;%p;%S;%r;%n' "${D}" | { while read l; do
+ arch=${l%%;*}; l=${l#*;}
+ obj="/${l%%;*}"; l=${l#*;}
+ soname=${l%%;*}; l=${l#*;}
+ 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
echo "${obj} ${needed}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED
+ echo "${arch:3};${obj};${soname};${rpath};${needed}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED.2
else
dir=$(dirname ${obj})
# replace $ORIGIN with the dirname of the current object for the lookup
@@ -176,7 +179,10 @@ install_qa_check() {
[ -e "${D}/${dir}/${lib}" ] || rneeded="${rneeded},${lib}"
done
rneeded=${rneeded:1}
- [ -n "${rneeded}" ] && echo "${obj} ${rneeded}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED
+ 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
+ fi
fi
done }