Merge pull request easybuilders#19119 from t1mk1k/ensure-casacore-pyt…

…hon-dependency-is-used Ensure right Python version is used in DP3, WSClean and dependencies
ItIsI-Orient · Oct 31, 2023 · a8aca9a · a8aca9a
2 parents dc8e0c9 + d7da953
commit a8aca9a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 1 deletion.
diff --git a/easybuild/easyconfigs/a/AOFlagger/AOFlagger-3.4.0-foss-2022a.eb b/easybuild/easyconfigs/a/AOFlagger/AOFlagger-3.4.0-foss-2022a.eb
@@ -32,6 +32,11 @@ dependencies = [
     ('libxml2', '2.9.13'),
 ]
 
+# Without this, the wrong (system) python is picked up by cmake
+# in cases where the system python is newer than the one used in these EasyConfigs
+# See PR # 19119
+configopts = '-DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python '
+
 sanity_check_paths = {
     'files': ['include/aoflagger.h', 'bin/aoflagger'],
     'dirs': ['bin'],

diff --git a/easybuild/easyconfigs/c/casacore/casacore-3.5.0-foss-2022a.eb b/easybuild/easyconfigs/c/casacore/casacore-3.5.0-foss-2022a.eb
@@ -42,7 +42,11 @@ dependencies = [
 ]
 
 configopts = '-DBUILD_PYTHON=NO -DBUILD_PYTHON3=YES -Wno-dev -DCXX11="ON" -DDATA_DIR=%(installdir)s/data '
-configopts += '-DUSE_OPENMP=ON -DUSE_HDF5=ON -DUSE_MPI=ON'
+configopts += '-DUSE_OPENMP=ON -DUSE_HDF5=ON -DUSE_MPI=ON '
+# Without this, the wrong (system) python is picked up by cmake
+# in cases where the system python is newer than the one used in these EasyConfigs
+# See PR # 19119
+configopts += '-DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python '
 
 sanity_check_paths = {
     'files': ['lib/libcasa_casa.%s' % SHLIB_EXT, 'lib/libcasa_mirlib.%s' % SHLIB_EXT,

diff --git a/easybuild/easyconfigs/d/DP3/DP3-6.0-foss-2022a.eb b/easybuild/easyconfigs/d/DP3/DP3-6.0-foss-2022a.eb
@@ -36,6 +36,11 @@ dependencies = [
     ('AOFlagger', '3.4.0')
 ]
 
+# Without this, the wrong (system) python is picked up by cmake
+# in cases where the system python is newer than the one used in these EasyConfigs
+# See PR # 19119
+configopts = '-DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python '
+
 sanity_check_paths = {
     'files': ['include/include/dp3/base/DP3.h', 'bin/DP3'],
     'dirs': ['bin'],

diff --git a/easybuild/easyconfigs/e/EveryBeam/EveryBeam-0.5.2-foss-2022a.eb b/easybuild/easyconfigs/e/EveryBeam/EveryBeam-0.5.2-foss-2022a.eb
@@ -36,6 +36,11 @@ dependencies = [
     ('libxml2', '2.9.13'),
 ]
 
+# Without this, the wrong (system) python is picked up by cmake
+# in cases where the system python is newer than the one used in these EasyConfigs
+# See PR # 19119
+configopts = '-DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python '
+
 sanity_check_paths = {
     'files': ['include/EveryBeam/beamformer.h', 'lib/libeverybeam.so'],
     'dirs': [],

diff --git a/easybuild/easyconfigs/w/WSClean/WSClean-3.4-foss-2022a.eb b/easybuild/easyconfigs/w/WSClean/WSClean-3.4-foss-2022a.eb
@@ -31,6 +31,11 @@ dependencies = [
     ('Python', '3.10.4'),
 ]
 
+# Without this, the wrong (system) python is picked up by cmake
+# in cases where the system python is newer than the one used in these EasyConfigs
+# See PR # 19119
+configopts = '-DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python '
+
 sanity_check_paths = {
     'files': ['include/wscleaninterface.h', 'bin/wsclean'],
     'dirs': ['bin'],