Skip to content

Commit

Permalink
{2023.06}[foss/2022a] matplotlib v3.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
TopRichard committed Oct 11, 2023
1 parent 860f935 commit 89cc228
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
14 changes: 13 additions & 1 deletion eb_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,25 @@ def get_rpath_override_dirs(software_name):

return rpath_injection_dirs

def set_Pillow_envvars(ec):
"""Get an EESSI_CPATH environment variable from the environment"""
EESSI_CPATH = os.getenv('EESSI_EPREFIX') + '/usr/include'
EESSI_LIB_PATH = os.getenv('EESSI_EPREFIX') + '/usr/lib64'
if ec.name == 'Pillow':
os.environ['CPATH'] = os.pathsep + EESSI_CPATH
os.environ['LIBRARY_PATH'] = os.pathsep + EESSI_LIB_PATH
print_msg("NOTE: For Pillow which has Szip as a dependancy, CPATH has been set to %s", os.getenv('CPATH'))
print_msg("NOTE: For Pillow which has Szip as a dependancy, LIBRARY_PATH has been set to %s", os.getenv('LIBRARY_PATH'))
ec.log.info("NOTE: For Pillow which has Szip as a dependancy, CPATH has been set to %s", os.getenv('CPATH'))
ec.log.info("NOTE: For Pillow which has Szip as a dependancy, LIBRARY_PATH has been set to %s", os.getenv('LIBRARY_PATH'))


def parse_hook(ec, *args, **kwargs):
"""Main parse hook: trigger custom functions based on software name."""

# determine path to Prefix installation in compat layer via $EPREFIX
eprefix = get_eessi_envvar('EPREFIX')

set_Pillow_envvars(ec)
if ec.name in PARSE_HOOKS:
PARSE_HOOKS[ec.name](ec, eprefix)

Expand Down
8 changes: 7 additions & 1 deletion eessi-2023.06-eb-4.8.1-2022a.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@ easyconfigs:
from-pr: 18870
- foss-2022a
- SciPy-bundle-2022.05-foss-2022a
- BAMM-2.5.0-foss-2022a.eb
- BAMM-2.5.0-foss-2022a.eb
- Pillow-9.1.1-GCCcore-11.3.0.eb:
# avoid that hardcoded paths like /usr/include are used in build commands
# Uses a hook to modify the hardcoded LIBRARY and Header paths.
options:
from-pr: 18881
- matplotlib-3.5.2-foss-2022a.eb

0 comments on commit 89cc228

Please sign in to comment.