| 1 |
commit: 1120e6f62feb1aa0d3202beb00c01537d352f420 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 10 02:26:12 2019 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 11 18:07:43 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1120e6f6 |
| 7 |
|
| 8 |
lib/p/util/_dyn_libs/LinkageMapELF.py: get dep graph from EROOT. |
| 9 |
|
| 10 |
On Prefix, the preserve-libs feature should search for shared |
| 11 |
libraries consumers from EROOT instead of ROOT. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/646090 |
| 14 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 15 |
|
| 16 |
lib/portage/util/_dyn_libs/LinkageMapELF.py | 5 +++-- |
| 17 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/lib/portage/util/_dyn_libs/LinkageMapELF.py b/lib/portage/util/_dyn_libs/LinkageMapELF.py |
| 20 |
index a063621c1..92a50b444 100644 |
| 21 |
--- a/lib/portage/util/_dyn_libs/LinkageMapELF.py |
| 22 |
+++ b/lib/portage/util/_dyn_libs/LinkageMapELF.py |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1998-2016 Gentoo Foundation |
| 25 |
+# Copyright 1998-2019 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
import errno |
| 29 |
@@ -222,7 +222,8 @@ class LinkageMapELF(object): |
| 30 |
root = self._root |
| 31 |
root_len = len(root) - 1 |
| 32 |
self._clear_cache() |
| 33 |
- self._defpath.update(getlibpaths(self._root, env=self._dbapi.settings)) |
| 34 |
+ self._defpath.update(getlibpaths(self._dbapi.settings['EROOT'], |
| 35 |
+ env=self._dbapi.settings)) |
| 36 |
libs = self._libs |
| 37 |
obj_properties = self._obj_properties |
Archives