summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/misc-functions.sh4
-rw-r--r--pym/portage/dbapi/vartree.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 2486bd96c..1d7af4043 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -168,7 +168,7 @@ install_qa_check() {
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
+ echo "${arch:3};${obj};${soname};${rpath};${needed}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED.ELF.2
else
dir=$(dirname ${obj})
# replace $ORIGIN with the dirname of the current object for the lookup
@@ -185,7 +185,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.ELF.2
fi
fi
done }
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index c79da9064..039d92a3e 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -137,10 +137,10 @@ class LinkageMap(object):
obj_properties = {}
lines = []
for cpv in self._dbapi.cpv_all():
- lines += grabfile(self._dbapi.getpath(cpv, filename="NEEDED.2"))
+ lines += grabfile(self._dbapi.getpath(cpv, filename="NEEDED.ELF.2"))
# have to call scanelf for preserved libs here as they aren't
- # registered in NEEDED.2 files
+ # registered in NEEDED.ELF.2 files
if self._dbapi.plib_registry and self._dbapi.plib_registry.getPreservedLibs():
args = ["/usr/bin/scanelf", "-yqF", "%a;%F;%S;%r;%n"]
for items in self._dbapi.plib_registry.getPreservedLibs().values():