commit: 51fca1db10a0c9f86713ee12b46cc29c4fb9fa3f
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 4 15:41:06 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 4 15:41:06 2020 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=51fca1db
EbuildPhase: also look in /usr/lib paths for missing sonames
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
lib/_emerge/EbuildPhase.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/_emerge/EbuildPhase.py b/lib/_emerge/EbuildPhase.py
index 6d08d88d1..496db33ec 100644
--- a/lib/_emerge/EbuildPhase.py
+++ b/lib/_emerge/EbuildPhase.py
@@ -515,12 +515,13 @@ class _PostPhaseCommands(CompositeTask):
unresolved.remove((obj, libs))
libs=list(libs)
for lib in list(libs):
- for path in ['/lib64', '/lib/64',
'/lib']:
+ for path in ['/lib64', '/lib/64',
'/lib', \
+ '/usr/lib64',
'/usr/lib/64', '/usr/lib']:
if
os.path.exists(os.path.join(path, lib)):
libs.remove(lib)
break
if len(libs) > 0:
- unresolved.add((obj, tuple(libs)))
+ unresolved.append((obj, tuple(libs)))
# END PREFIX LOCAL
if unresolved:
