Merge pull request easybuilders#19226 from ocaisa/20231113143856_new_…

…pr_Pillow1000 Make Pillow easyconfigs aware of sysroot
CLIP-HPC · Nov 13, 2023 · 1ae8ca7 · 1ae8ca7
2 parents 37debc4 + c0ad1ab
commit 1ae8ca7
Show file tree

Hide file tree

Showing 13 changed files with 91 additions and 0 deletions.
diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-10.0.0-GCCcore-12.3.0.eb b/easybuild/easyconfigs/p/Pillow/Pillow-10.0.0-GCCcore-12.3.0.eb
@@ -24,8 +24,15 @@ dependencies = [
 ]
 
 download_dep_fail = True
+
+# If we have a sysroot, make sure it is picked up
+# (should not affect non-sysroot as the template is empty in this scenario)
+preinstallopts = "export CPATH=$CPATH:%(sysroot)s/usr/include && "
+preinstallopts += "export LIBRARY_PATH=$LIBRARY_PATH:%(sysroot)s/usr/lib:%(sysroot)s/usr/lib64 && "
+
 # avoid that hardcoded paths like /usr/include are used in build commands
 installopts = "--global-option=build_ext --global-option='--disable-platform-guessing' "
+
 use_pip = True
 sanity_pip_check = True
 

diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-6.0.0-GCCcore-8.2.0.eb b/easybuild/easyconfigs/p/Pillow/Pillow-6.0.0-GCCcore-8.2.0.eb
@@ -25,8 +25,15 @@ dependencies = [
 ]
 
 download_dep_fail = True
+
+# If we have a sysroot, make sure it is picked up
+# (should not affect non-sysroot as the template is empty in this scenario)
+preinstallopts = "export CPATH=$CPATH:%(sysroot)s/usr/include && "
+preinstallopts += "export LIBRARY_PATH=$LIBRARY_PATH:%(sysroot)s/usr/lib:%(sysroot)s/usr/lib64 && "
+
 # avoid that hardcoded paths like /usr/include are used in build commands
 installopts = "--global-option=build_ext --global-option='--disable-platform-guessing' "
+
 use_pip = True
 sanity_pip_check = True
 

diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-6.2.1-GCCcore-8.3.0.eb b/easybuild/easyconfigs/p/Pillow/Pillow-6.2.1-GCCcore-8.3.0.eb
@@ -25,8 +25,15 @@ dependencies = [
 ]
 
 download_dep_fail = True
+
+# If we have a sysroot, make sure it is picked up
+# (should not affect non-sysroot as the template is empty in this scenario)
+preinstallopts = "export CPATH=$CPATH:%(sysroot)s/usr/include && "
+preinstallopts += "export LIBRARY_PATH=$LIBRARY_PATH:%(sysroot)s/usr/lib:%(sysroot)s/usr/lib64 && "
+
 # avoid that hardcoded paths like /usr/include are used in build commands
 installopts = "--global-option=build_ext --global-option='--disable-platform-guessing' "
+
 use_pip = True
 sanity_pip_check = True
 

diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-7.0.0-GCCcore-9.3.0-Python-3.8.2.eb b/easybuild/easyconfigs/p/Pillow/Pillow-7.0.0-GCCcore-9.3.0-Python-3.8.2.eb
@@ -29,8 +29,15 @@ dependencies = [
 ]
 
 download_dep_fail = True
+
+# If we have a sysroot, make sure it is picked up
+# (should not affect non-sysroot as the template is empty in this scenario)
+preinstallopts = "export CPATH=$CPATH:%(sysroot)s/usr/include && "
+preinstallopts += "export LIBRARY_PATH=$LIBRARY_PATH:%(sysroot)s/usr/lib:%(sysroot)s/usr/lib64 && "
+
 # avoid that hardcoded paths like /usr/include are used in build commands
 installopts = "--global-option=build_ext --global-option='--disable-platform-guessing' "
+
 use_pip = True
 sanity_pip_check = True
 

diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-8.0.1-GCCcore-10.2.0.eb b/easybuild/easyconfigs/p/Pillow/Pillow-8.0.1-GCCcore-10.2.0.eb
@@ -28,8 +28,15 @@ dependencies = [
 ]
 
 download_dep_fail = True
+
+# If we have a sysroot, make sure it is picked up
+# (should not affect non-sysroot as the template is empty in this scenario)
+preinstallopts = "export CPATH=$CPATH:%(sysroot)s/usr/include && "
+preinstallopts += "export LIBRARY_PATH=$LIBRARY_PATH:%(sysroot)s/usr/lib:%(sysroot)s/usr/lib64 && "
+
 # avoid that hardcoded paths like /usr/include are used in build commands
 installopts = "--global-option=build_ext --global-option='--disable-platform-guessing' "
+
 use_pip = True
 sanity_pip_check = True
 

diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-8.2.0-GCCcore-10.3.0.eb b/easybuild/easyconfigs/p/Pillow/Pillow-8.2.0-GCCcore-10.3.0.eb
@@ -28,8 +28,15 @@ dependencies = [
 ]
 
 download_dep_fail = True
+
+# If we have a sysroot, make sure it is picked up
+# (should not affect non-sysroot as the template is empty in this scenario)
+preinstallopts = "export CPATH=$CPATH:%(sysroot)s/usr/include && "
+preinstallopts += "export LIBRARY_PATH=$LIBRARY_PATH:%(sysroot)s/usr/lib:%(sysroot)s/usr/lib64 && "
+
 # avoid that hardcoded paths like /usr/include are used in build commands
 installopts = "--global-option=build_ext --global-option='--disable-platform-guessing' "
+
 use_pip = True
 sanity_pip_check = True
 

diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-8.3.1-GCCcore-11.2.0.eb b/easybuild/easyconfigs/p/Pillow/Pillow-8.3.1-GCCcore-11.2.0.eb
@@ -28,8 +28,15 @@ dependencies = [
 ]
 
 download_dep_fail = True
+
+# If we have a sysroot, make sure it is picked up
+# (should not affect non-sysroot as the template is empty in this scenario)
+preinstallopts = "export CPATH=$CPATH:%(sysroot)s/usr/include && "
+preinstallopts += "export LIBRARY_PATH=$LIBRARY_PATH:%(sysroot)s/usr/lib:%(sysroot)s/usr/lib64 && "
+
 # avoid that hardcoded paths like /usr/include are used in build commands
 installopts = "--global-option=build_ext --global-option='--disable-platform-guessing' "
+
 use_pip = True
 sanity_pip_check = True
 

diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-8.3.2-GCCcore-11.2.0.eb b/easybuild/easyconfigs/p/Pillow/Pillow-8.3.2-GCCcore-11.2.0.eb
@@ -24,8 +24,15 @@ dependencies = [
 ]
 
 download_dep_fail = True
+
+# If we have a sysroot, make sure it is picked up
+# (should not affect non-sysroot as the template is empty in this scenario)
+preinstallopts = "export CPATH=$CPATH:%(sysroot)s/usr/include && "
+preinstallopts += "export LIBRARY_PATH=$LIBRARY_PATH:%(sysroot)s/usr/lib:%(sysroot)s/usr/lib64 && "
+
 # avoid that hardcoded paths like /usr/include are used in build commands
 installopts = "--global-option=build_ext --global-option='--disable-platform-guessing' "
+
 use_pip = True
 sanity_pip_check = True
 

diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-9.1.0-GCCcore-10.3.0.eb b/easybuild/easyconfigs/p/Pillow/Pillow-9.1.0-GCCcore-10.3.0.eb
@@ -24,8 +24,15 @@ dependencies = [
 ]
 
 download_dep_fail = True
+
+# If we have a sysroot, make sure it is picked up
+# (should not affect non-sysroot as the template is empty in this scenario)
+preinstallopts = "export CPATH=$CPATH:%(sysroot)s/usr/include && "
+preinstallopts += "export LIBRARY_PATH=$LIBRARY_PATH:%(sysroot)s/usr/lib:%(sysroot)s/usr/lib64 && "
+
 # avoid that hardcoded paths like /usr/include are used in build commands
 installopts = "--global-option=build_ext --global-option='--disable-platform-guessing' "
+
 use_pip = True
 sanity_pip_check = True
 

diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-9.1.1-GCCcore-11.2.0.eb b/easybuild/easyconfigs/p/Pillow/Pillow-9.1.1-GCCcore-11.2.0.eb
@@ -24,8 +24,15 @@ dependencies = [
 ]
 
 download_dep_fail = True
+
+# If we have a sysroot, make sure it is picked up
+# (should not affect non-sysroot as the template is empty in this scenario)
+preinstallopts = "export CPATH=$CPATH:%(sysroot)s/usr/include && "
+preinstallopts += "export LIBRARY_PATH=$LIBRARY_PATH:%(sysroot)s/usr/lib:%(sysroot)s/usr/lib64 && "
+
 # avoid that hardcoded paths like /usr/include are used in build commands
 installopts = "--global-option=build_ext --global-option='--disable-platform-guessing' "
+
 use_pip = True
 sanity_pip_check = True
 

diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-9.1.1-GCCcore-11.3.0.eb b/easybuild/easyconfigs/p/Pillow/Pillow-9.1.1-GCCcore-11.3.0.eb
@@ -24,8 +24,15 @@ dependencies = [
 ]
 
 download_dep_fail = True
+
+# If we have a sysroot, make sure it is picked up
+# (should not affect non-sysroot as the template is empty in this scenario)
+preinstallopts = "export CPATH=$CPATH:%(sysroot)s/usr/include && "
+preinstallopts += "export LIBRARY_PATH=$LIBRARY_PATH:%(sysroot)s/usr/lib:%(sysroot)s/usr/lib64 && "
+
 # avoid that hardcoded paths like /usr/include are used in build commands
 installopts = "--global-option=build_ext --global-option='--disable-platform-guessing' "
+
 use_pip = True
 sanity_pip_check = True
 

diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-9.2.0-GCCcore-10.2.0.eb b/easybuild/easyconfigs/p/Pillow/Pillow-9.2.0-GCCcore-10.2.0.eb
@@ -26,8 +26,15 @@ dependencies = [
 ]
 
 download_dep_fail = True
+
+# If we have a sysroot, make sure it is picked up
+# (should not affect non-sysroot as the template is empty in this scenario)
+preinstallopts = "export CPATH=$CPATH:%(sysroot)s/usr/include && "
+preinstallopts += "export LIBRARY_PATH=$LIBRARY_PATH:%(sysroot)s/usr/lib:%(sysroot)s/usr/lib64 && "
+
 # avoid that hardcoded paths like /usr/include are used in build commands
 installopts = "--global-option=build_ext --global-option='--disable-platform-guessing' "
+
 use_pip = True
 sanity_pip_check = True
 

diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-9.4.0-GCCcore-12.2.0.eb b/easybuild/easyconfigs/p/Pillow/Pillow-9.4.0-GCCcore-12.2.0.eb
@@ -24,8 +24,15 @@ dependencies = [
 ]
 
 download_dep_fail = True
+
+# If we have a sysroot, make sure it is picked up
+# (should not affect non-sysroot as the template is empty in this scenario)
+preinstallopts = "export CPATH=$CPATH:%(sysroot)s/usr/include && "
+preinstallopts += "export LIBRARY_PATH=$LIBRARY_PATH:%(sysroot)s/usr/lib:%(sysroot)s/usr/lib64 && "
+
 # avoid that hardcoded paths like /usr/include are used in build commands
 installopts = "--global-option=build_ext --global-option='--disable-platform-guessing' "
+
 use_pip = True
 sanity_pip_check = True