From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A530A138334 for ; Sun, 11 Aug 2019 18:09:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CFE9CE076B; Sun, 11 Aug 2019 18:09:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B3E28E076B for ; Sun, 11 Aug 2019 18:09:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D92A349903 for ; Sun, 11 Aug 2019 18:09:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 839EC734 for ; Sun, 11 Aug 2019 18:09:48 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1565546863.1120e6f62feb1aa0d3202beb00c01537d352f420.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/util/_dyn_libs/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/util/_dyn_libs/LinkageMapELF.py X-VCS-Directories: lib/portage/util/_dyn_libs/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 1120e6f62feb1aa0d3202beb00c01537d352f420 X-VCS-Branch: master Date: Sun, 11 Aug 2019 18:09:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4fdc6b3d-9c79-4abf-91b5-f58fa091d718 X-Archives-Hash: 6e7ad26b6301a055761d6d792ba57aac commit: 1120e6f62feb1aa0d3202beb00c01537d352f420 Author: Benda Xu gentoo org> AuthorDate: Sat Aug 10 02:26:12 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Aug 11 18:07:43 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1120e6f6 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 gentoo.org> lib/portage/util/_dyn_libs/LinkageMapELF.py | 5 +++-- 1 file 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