Skip to content
Merged
Changes from all commits
Commits
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
8 changes: 3 additions & 5 deletions easybuild/easyblocks/p/python.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,8 @@ def __init__(self, *args, **kwargs):
raise EasyBuildError("The ensurepip module required to install pip (requested by install_pip=True) "
"is not available in Python %s", self.version)

self._inject_patch_ctypes_ld_library_path()

def _get_pip_ext_version(self):
"""Return the pip version from exts_list or None"""
for ext in self.cfg.get_ref('exts_list'):
Expand All @@ -352,10 +354,8 @@ def _get_pip_ext_version(self):
return ext[1]
return None

def fetch_step(self, *args, **kwargs):
def _inject_patch_ctypes_ld_library_path(self):
"""
Custom fetch step for Python.

Add patch specified in patch_ctypes_ld_library_path to list of patches if
EasyBuild is configured to filter $LD_LIBRARY_PATH (and is configured not to filter $LIBRARY_PATH).
This needs to be done in (or before) the fetch step to ensure that those patches are also fetched.
Expand Down Expand Up @@ -408,8 +408,6 @@ def fetch_step(self, *args, **kwargs):
msg += "correctly."
self.log.warning(msg)

super().fetch_step(*args, **kwargs)

def patch_step(self, *args, **kwargs):
"""
Custom patch step for Python:
Expand Down