Merge pull request EESSI#202 from TopRichard/nessi.no-2023.06-Pillow/…

…9.1.1-foss/2022a

{2023.06}[foss/2022a] Pillow V9.1.1

eb_hooks.py

@@ -177,6 +177,23 @@ def parse_hook_openblas_relax_lapack_tests_num_errors(ec, eprefix):
         raise EasyBuildError("OpenBLAS-specific hook triggered for non-OpenBLAS easyconfig?!")
 
 
+def parse_hook_pillow_set_cpath_library_path(ec, eprefix):
+    """Extend CPATH and LIBRARY_PATH environment variables using EESSI_EPREFIX."""
+    if ec.name == 'Pillow':
+        EESSI_CPATH = os.getenv('EESSI_EPREFIX') + '/usr/include'
+        EESSI_LIB_PATH = os.getenv('EESSI_EPREFIX') + '/usr/lib64'
+        print_msg("NOTE: Pillow has zlib as a dependancy, The original CPATH value: (%s) has been extended with (%s)",
+                  os.getenv('CPATH'),  EESSI_CPATH)
+        print_msg("NOTE: Pillow has zlib as a dependancy, The original LIBRARY_PATH value: (%s) has been extended with (%s)",
+                  os.getenv('LIBRARY_PATH'),  EESSI_LIB_PATH)
+        ec.log.info("NOTE: Pillow has zlib as a dependancy, The original CPATH value: (%s)  has been extended with (%s)",
+                    os.getenv('CPATH'), EESSI_CPATH)
+        ec.log.info("NOTE: Pillow has zlib as a dependancy, The original LIBRARY_VALUE value: (%s) has been extended with (%s)",
+                    os.getenv('LIBRARY_PATH'), EESSI_LIB_PATH)
+        os.environ['CPATH'] = os.pathsep.join(filter(None,[os.environ.get('CPATH',''), EESSI_CPATH]))
+        os.environ['LIBRARY_PATH'] = os.pathsep.join(filter(None,[os.environ.get('LIBRARY_PATH',''), EESSI_LIB_PATH]))
+
+
 def parse_hook_ucx_eprefix(ec, eprefix):
     """Make UCX aware of compatibility layer via additional configuration options."""
     if ec.name == 'UCX':
@@ -272,6 +289,7 @@ def pre_test_hook_ignore_failing_tests_SciPybundle(self, *args, **kwargs):
     'CGAL': parse_hook_cgal_toolchainopts_precise,
     'fontconfig': parse_hook_fontconfig_add_fonts,
     'OpenBLAS': parse_hook_openblas_relax_lapack_tests_num_errors,
+    'Pillow': parse_hook_pillow_set_cpath_library_path,
     'UCX': parse_hook_ucx_eprefix,
 }
 

eessi-2023.06-eb-4.8.1-2022a.yml

@@ -51,3 +51,7 @@ easyconfigs:
   - Tk-8.6.12-GCCcore-11.3.0.eb
   - GROMACS-2023.1-foss-2022a.eb
   - MUMPS-5.5.1-foss-2022a-metis.eb
+  - Pillow-9.1.1-GCCcore-11.3.0.eb:
+      # Uses a custom hook since has zlib as dependency which has hard coded header and library path within Pillow code.
+      options:
+        from-pr: 18881