From 89cc228e5fc0a629a422134e67693b1a60f2fe25 Mon Sep 17 00:00:00 2001
From: TopRichard <richard.topouchian@uib.no>
Date: Wed, 11 Oct 2023 06:42:48 +0000
Subject: [PATCH] {2023.06}[foss/2022a] matplotlib v3.5.2

---
 eb_hooks.py                      | 14 +++++++++++++-
 eessi-2023.06-eb-4.8.1-2022a.yml |  8 +++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/eb_hooks.py b/eb_hooks.py
index dbb8415541..2bdead4b73 100644
--- a/eb_hooks.py
+++ b/eb_hooks.py
@@ -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)
 
diff --git a/eessi-2023.06-eb-4.8.1-2022a.yml b/eessi-2023.06-eb-4.8.1-2022a.yml
index 97704ebe30..87ca700d96 100644
--- a/eessi-2023.06-eb-4.8.1-2022a.yml
+++ b/eessi-2023.06-eb-4.8.1-2022a.yml
@@ -6,4 +6,10 @@ easyconfigs:
         from-pr: 18870
   - foss-2022a
   - SciPy-bundle-2022.05-foss-2022a
-  - BAMM-2.5.0-foss-2022a.eb
\ No newline at end of file
+  - 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