commit: 54d3676d4dc90444895c99c0b6c29d6be6a25b77 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> AuthorDate: Mon Jun 6 16:00:59 2016 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Mon Jun 6 16:00:59 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=54d3676d
LinkageMapELF: Account for EPREFIX in scanelf path (bug 583754) X-Gentoo-Bug: 583754 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=583754 pym/portage/util/_dyn_libs/LinkageMapELF.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py b/pym/portage/util/_dyn_libs/LinkageMapELF.py index 63e2213..0b09fe5 100644 --- a/pym/portage/util/_dyn_libs/LinkageMapELF.py +++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py @@ -1,4 +1,4 @@ -# Copyright 1998-2013 Gentoo Foundation +# Copyright 1998-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import errno @@ -11,6 +11,7 @@ from portage import _os_merge from portage import _unicode_decode from portage import _unicode_encode from portage.cache.mappings import slot_dict_class +from portage.const import EPREFIX from portage.exception import CommandNotFound, InvalidData from portage.localization import _ from portage.util import getlibpaths @@ -259,7 +260,7 @@ class LinkageMapELF(object): continue plibs.update((x, cpv) for x in items) if plibs: - args = ["/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"] + args = [os.path.join(EPREFIX or "/", "usr/bin/scanelf"), "-qF", "%a;%F;%S;%r;%n"] args.extend(os.path.join(root, x.lstrip("." + os.sep)) \ for x in plibs) try:
