| 1 |
Author: grobian |
| 2 |
Date: 2008-05-08 20:01:27 +0000 (Thu, 08 May 2008) |
| 3 |
New Revision: 10248 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
try to follow the changed 'interface' of linkmap in our MachO implementation |
| 9 |
|
| 10 |
Modified: main/branches/prefix/pym/portage/dbapi/vartree.py |
| 11 |
=================================================================== |
| 12 |
--- main/branches/prefix/pym/portage/dbapi/vartree.py 2008-05-08 19:47:28 UTC (rev 10247) |
| 13 |
+++ main/branches/prefix/pym/portage/dbapi/vartree.py 2008-05-08 20:01:27 UTC (rev 10248) |
| 14 |
@@ -235,13 +235,16 @@ |
| 15 |
self._libs = {} |
| 16 |
self._obj_properties = {} |
| 17 |
|
| 18 |
- def rebuild(self): |
| 19 |
+ def rebuild(self, include_file=None): |
| 20 |
libs = {} |
| 21 |
obj_properties = {} |
| 22 |
lines = [] |
| 23 |
for cpv in self._dbapi.cpv_all(): |
| 24 |
lines += grabfile(self._dbapi.getpath(cpv, filename="NEEDED.MACHO.2")) |
| 25 |
|
| 26 |
+ if include_file: |
| 27 |
+ lines += grabfile(include_file) |
| 28 |
+ |
| 29 |
for l in lines: |
| 30 |
if l.strip() == "": |
| 31 |
continue |
| 32 |
@@ -1763,7 +1766,10 @@ |
| 33 |
def _preserve_libs(self, srcroot, destroot, mycontents, counter, inforoot): |
| 34 |
# read global reverse NEEDED map |
| 35 |
linkmap = self.vartree.dbapi.linkmap |
| 36 |
- linkmap.rebuild(include_file=os.path.join(inforoot, "NEEDED.ELF.2")) |
| 37 |
+ if ostype == "Darwin": |
| 38 |
+ linkmap.rebuild(include_file=os.path.join(inforoot, "NEEDED.MACHO.2")) |
| 39 |
+ else: |
| 40 |
+ linkmap.rebuild(include_file=os.path.join(inforoot, "NEEDED.ELF.2")) |
| 41 |
liblist = linkmap.listLibraryObjects() |
| 42 |
|
| 43 |
# get list of libraries from old package instance |
| 44 |
|
| 45 |
-- |
| 46 |
gentoo-commits@l.g.o mailing list |
Archives