[patch] prefix-preserve-libs.patch

prefix-preserve-libs.patch (text/plain), 942 bytes, created by Benda Xu on 2019-08-10 02:39:55 UTC

commit ecbbb1b1a87899e69b3ba56b9ac433b708b27a68
Author: Benda Xu <[e-mail]>
Date:   Sat Aug 10 10:26:12 2019 +0800

    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.

diff --git a/lib/portage/util/_dyn_libs/LinkageMapELF.py b/lib/portage/util/_dyn_libs/LinkageMapELF.py
index a063621c1..daef8df4a 100644
--- a/lib/portage/util/_dyn_libs/LinkageMapELF.py
+++ b/lib/portage/util/_dyn_libs/LinkageMapELF.py
@@ -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))
+		eroot = os.path.join(self._root, EPREFIX or "/")
+		self._defpath.update(getlibpaths(eroot, env=self._dbapi.settings))
 		libs = self._libs
 		obj_properties = self._obj_properties