rename NEEDED.2 to NEEDED.ELF.2 to allow other ABI formats to use a different syntax

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

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 2486bd96c9b78a8a24591d4bad7ed78389d18353..1d7af4043cfa70667f80c18d90fa0e87fdf4bdba 100755 (executable)
--- 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 c79da90641e0cb849cc63f2b0c4489b04b6efd6f..039d92a3e97c2b2fa5aba27a5a3c209f2b1271db 100644 (file)
--- 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():