aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenda Xu <heroxbd@gentoo.org>2019-08-10 10:26:12 +0800
committerZac Medico <zmedico@gentoo.org>2019-08-11 11:07:43 -0700
commit1120e6f62feb1aa0d3202beb00c01537d352f420 (patch)
tree127c73f91220650c8a014a891e3ff5c17c976893
parentbin/ebuild: Fix to work with installed package (diff)
downloadportage-1120e6f62feb1aa0d3202beb00c01537d352f420.tar.gz
portage-1120e6f62feb1aa0d3202beb00c01537d352f420.tar.bz2
portage-1120e6f62feb1aa0d3202beb00c01537d352f420.zip
lib/p/util/_dyn_libs/LinkageMapELF.py: get dep graph from EROOT.
On Prefix, the preserve-libs feature should search for shared libraries consumers from EROOT instead of ROOT. Bug: https://bugs.gentoo.org/646090 Signed-off-by: Zac Medico <zmedico@gentoo.org>
-rw-r--r--lib/portage/util/_dyn_libs/LinkageMapELF.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/portage/util/_dyn_libs/LinkageMapELF.py b/lib/portage/util/_dyn_libs/LinkageMapELF.py
index a063621c1..92a50b444 100644
--- a/lib/portage/util/_dyn_libs/LinkageMapELF.py
+++ b/lib/portage/util/_dyn_libs/LinkageMapELF.py
@@ -1,4 +1,4 @@
-# Copyright 1998-2016 Gentoo Foundation
+# Copyright 1998-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
import errno
@@ -222,7 +222,8 @@ class LinkageMapELF(object):
root = self._root
root_len = len(root) - 1
self._clear_cache()
- self._defpath.update(getlibpaths(self._root, env=self._dbapi.settings))
+ self._defpath.update(getlibpaths(self._dbapi.settings['EROOT'],
+ env=self._dbapi.settings))
libs = self._libs
obj_properties = self._obj_properties