Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ENH check all sysroot locations for DSOs #3969

Merged
merged 2 commits into from
Jun 30, 2020
Merged

ENH check all sysroot locations for DSOs #3969

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fefe5d0
ENH check all sysroot locations for DSOs
beckermr Jun 9, 2020
c627c83
Merge branch 'master' into all-sysroots
beckermr Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions conda_build/post.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,16 +896,16 @@ def _lookup_in_sysroots_and_whitelist(errors, whitelist, needed_dso, sysroots_fi
# Removing sysroot_prefix is only for Linux, though we could
# use CONDA_BUILD_SYSROOT for macOS. We should figure out what to do about
# /opt/X11 too.
# Find the longest suffix match.
rev_needed_dso = needed_dso[::-1]
match_lens = [len(commonprefix([s[::-1], rev_needed_dso]))
for s in sysroot_files]
idx = max(range(len(match_lens)), key=match_lens.__getitem__)
# in_prefix_dso = normpath(sysroot_files[idx].replace(
# sysroot_prefix + os.sep, ''))
in_prefix_dso = sysroot_files[idx][len(sysroot_prefix) + 1:]
n_dso_p = "Needed DSO {}".format(in_prefix_dso)
pkgs = list(which_package(in_prefix_dso, sysroot_prefix))
pkgs = []
for idx in range(len(sysroot_files)):
# in_prefix_dso = normpath(sysroot_files[idx].replace(
# sysroot_prefix + os.sep, ''))
in_prefix_dso = sysroot_files[idx][len(sysroot_prefix) + 1:]
n_dso_p = "Needed DSO {}".format(in_prefix_dso)
_pkgs = list(which_package(in_prefix_dso, sysroot_prefix))
if len(_pkgs) > 0:
pkgs.extend(_pkgs)
break
if len(pkgs):
_print_msg(errors, '{}: {} found in CDT/compiler package {}'.
format(info_prelude, n_dso_p, pkgs[0]), verbose=verbose)
Expand Down