diff options
| author | Marius Mauch <genone@gentoo.org> | 2008-05-02 10:04:20 +0000 |
|---|---|---|
| committer | Marius Mauch <genone@gentoo.org> | 2008-05-02 10:04:20 +0000 |
| commit | f4ef344ace719cbb026199660f9b44535e5be79b (patch) | |
| tree | 634eabfc2aeb3dd7de3b5df00794fd78365515f7 | |
| parent | fa0efbdd9696d841a84d7ea09ed67cf73a4f5fa8 (diff) | |
| download | portage-f4ef344ace719cbb026199660f9b44535e5be79b.tar.gz portage-f4ef344ace719cbb026199660f9b44535e5be79b.tar.bz2 portage-f4ef344ace719cbb026199660f9b44535e5be79b.zip | |
rename NEEDED.2 to NEEDED.ELF.2 to allow other ABI formats to use a different syntax
svn path=/main/trunk/; revision=10085
| -rwxr-xr-x | bin/misc-functions.sh | 4 | ||||
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 4 |
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(): |