Skip to content

Commit

Permalink
Merge pull request #3464 from jfgrimm/ubuntu-24.04-install-fixes
Browse files Browse the repository at this point in the history
strip leading `local/` from pylibdir where appropriate
  • Loading branch information
boegel authored Sep 26, 2024
2 parents d49118e + 44e21b3 commit aff313d
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions easybuild/easyblocks/generic/pythonpackage.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,15 @@ def det_pylibdir(plat_specific=False, python_cmd=None):
cmd, prefix, out, ec)

pylibdir = txt[len(prefix):]

# Ubuntu 24.04: the pylibdir has a leading local/, which causes issues later
# e.g. when symlinking <installdir>/local/* to <installdir>/*
# we can safely strip this to get a working installation
local = 'local/'
if pylibdir.startswith(local):
log.info("Removing leading /local from determined pylibdir: %s" % pylibdir)
pylibdir = pylibdir[len(local):]

log.debug("Determined pylibdir using '%s': %s", cmd, pylibdir)
return pylibdir

Expand Down

0 comments on commit aff313d

Please sign in to comment.