|
Line
Link Here
|
| 0 |
-- pym/portage/util/_dyn_libs/LinkageMapELF.py |
0 |
++ pym/portage/util/_dyn_libs/LinkageMapELF.py |
|
Lines 19-24
from portage.util import normalize_path
Link Here
|
| 19 |
from portage.util import varexpand |
19 |
from portage.util import varexpand |
| 20 |
from portage.util import writemsg_level |
20 |
from portage.util import writemsg_level |
| 21 |
from portage.util._dyn_libs.NeededEntry import NeededEntry |
21 |
from portage.util._dyn_libs.NeededEntry import NeededEntry |
|
|
22 |
from portage.const import EPREFIX |
| 22 |
|
23 |
|
| 23 |
# Map ELF e_machine values from NEEDED.ELF.2 to approximate multilib |
24 |
# Map ELF e_machine values from NEEDED.ELF.2 to approximate multilib |
| 24 |
# categories. This approximation will produce incorrect results on x32 |
25 |
# categories. This approximation will produce incorrect results on x32 |
|
Lines 259-265
class LinkageMapELF(object):
Link Here
|
| 259 |
continue |
260 |
continue |
| 260 |
plibs.update((x, cpv) for x in items) |
261 |
plibs.update((x, cpv) for x in items) |
| 261 |
if plibs: |
262 |
if plibs: |
| 262 |
args = ["/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"] |
263 |
args = [EPREFIX + "/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"] |
| 263 |
args.extend(os.path.join(root, x.lstrip("." + os.sep)) \ |
264 |
args.extend(os.path.join(root, x.lstrip("." + os.sep)) \ |
| 264 |
for x in plibs) |
265 |
for x in plibs) |
| 265 |
try: |
266 |
try: |
