| 1 |
Author: genone |
| 2 |
Date: 2008-05-02 10:04:20 +0000 (Fri, 02 May 2008) |
| 3 |
New Revision: 10085 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/misc-functions.sh |
| 7 |
main/trunk/pym/portage/dbapi/vartree.py |
| 8 |
Log: |
| 9 |
rename NEEDED.2 to NEEDED.ELF.2 to allow other ABI formats to use a different syntax |
| 10 |
|
| 11 |
Modified: main/trunk/bin/misc-functions.sh |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/bin/misc-functions.sh 2008-05-02 09:43:13 UTC (rev 10084) |
| 14 |
+++ main/trunk/bin/misc-functions.sh 2008-05-02 10:04:20 UTC (rev 10085) |
| 15 |
@@ -168,7 +168,7 @@ |
| 16 |
if [ -z "${rpath}" -o -n "${rpath//*ORIGIN*}" ]; then |
| 17 |
# object doesn't contain $ORIGIN in its runpath attribute |
| 18 |
echo "${obj} ${needed}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED |
| 19 |
- echo "${arch:3};${obj};${soname};${rpath};${needed}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED.2 |
| 20 |
+ echo "${arch:3};${obj};${soname};${rpath};${needed}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED.ELF.2 |
| 21 |
else |
| 22 |
dir=$(dirname ${obj}) |
| 23 |
# replace $ORIGIN with the dirname of the current object for the lookup |
| 24 |
@@ -185,7 +185,7 @@ |
| 25 |
rneeded=${rneeded:1} |
| 26 |
if [ -n "${rneeded}" ]; then |
| 27 |
echo "${obj} ${rneeded}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED |
| 28 |
- echo "${arch:3};${obj};${soname};${rpath};${rneeded}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED.2 |
| 29 |
+ echo "${arch:3};${obj};${soname};${rpath};${rneeded}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED.ELF.2 |
| 30 |
fi |
| 31 |
fi |
| 32 |
done } |
| 33 |
|
| 34 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 35 |
=================================================================== |
| 36 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-05-02 09:43:13 UTC (rev 10084) |
| 37 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-05-02 10:04:20 UTC (rev 10085) |
| 38 |
@@ -137,10 +137,10 @@ |
| 39 |
obj_properties = {} |
| 40 |
lines = [] |
| 41 |
for cpv in self._dbapi.cpv_all(): |
| 42 |
- lines += grabfile(self._dbapi.getpath(cpv, filename="NEEDED.2")) |
| 43 |
+ lines += grabfile(self._dbapi.getpath(cpv, filename="NEEDED.ELF.2")) |
| 44 |
|
| 45 |
# have to call scanelf for preserved libs here as they aren't |
| 46 |
- # registered in NEEDED.2 files |
| 47 |
+ # registered in NEEDED.ELF.2 files |
| 48 |
if self._dbapi.plib_registry and self._dbapi.plib_registry.getPreservedLibs(): |
| 49 |
args = ["/usr/bin/scanelf", "-yqF", "%a;%F;%S;%r;%n"] |
| 50 |
for items in self._dbapi.plib_registry.getPreservedLibs().values(): |
| 51 |
|
| 52 |
-- |
| 53 |
gentoo-commits@l.g.o mailing list |
Archives