diff --git a/easybuild/easyconfigs/a/AOFlagger/AOFlagger-3.4.0-foss-2023b.eb b/easybuild/easyconfigs/a/AOFlagger/AOFlagger-3.4.0-foss-2023b.eb index 9504cae7704..d1fe2a3f7dd 100644 --- a/easybuild/easyconfigs/a/AOFlagger/AOFlagger-3.4.0-foss-2023b.eb +++ b/easybuild/easyconfigs/a/AOFlagger/AOFlagger-3.4.0-foss-2023b.eb @@ -36,12 +36,6 @@ dependencies = [ ('libxml2', '2.11.5'), ] -# 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/%(namelower)s.h', 'bin/%(namelower)s'], 'dirs': ['bin'], diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.0-foss-2023b.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.0-foss-2023b.eb index eadec17227f..04b73ebc183 100644 --- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.0-foss-2023b.eb +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.0-foss-2023b.eb @@ -12,6 +12,8 @@ description = "ARPACK is a collection of Fortran77 subroutines designed to solve toolchain = {'name': 'foss', 'version': '2023b'} toolchainopts = {'pic': True, 'usempi': True} +github_account = 'opencollab' + source_urls = [GITHUB_SOURCE] sources = ['%(version)s.tar.gz'] checksums = ['24f2a2b259992d3c797d80f626878aa8e2ed5009d549dad57854bbcfb95e1ed0'] @@ -27,10 +29,9 @@ dependencies = [ preconfigopts = "sh bootstrap && " configopts = '--enable-mpi --with-pic --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"' -github_account = 'opencollab' - sanity_check_paths = { - 'files': ['lib64/libarpack.la', 'lib64/libarpack.so', 'lib64/libparpack.la', 'lib64/libparpack.so'], + 'files': ['lib64/libarpack.la', 'lib64/libarpack.%s' % SHLIB_EXT, + 'lib64/libparpack.la', 'lib64/libparpack.%s' % SHLIB_EXT], 'dirs': [], } diff --git a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-4.3.1-GCCcore-13.2.0.eb b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-4.3.1-GCCcore-13.2.0.eb index 80c940b906b..c22b4a16118 100644 --- a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-4.3.1-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-4.3.1-GCCcore-13.2.0.eb @@ -34,7 +34,7 @@ buildopts = "&& make shared && make testprog" sanity_check_paths = { - 'files': ['lib/libcfitsio.a', 'lib/libcfitsio.so'], + 'files': ['lib/libcfitsio.a', 'lib/libcfitsio.%s' % SHLIB_EXT], 'dirs': ['include'], } diff --git a/easybuild/easyconfigs/c/casacore/casacore-3.5.0-foss-2023b.eb b/easybuild/easyconfigs/c/casacore/casacore-3.5.0-foss-2023b.eb index f101eaf6ee9..d83d40387f2 100644 --- a/easybuild/easyconfigs/c/casacore/casacore-3.5.0-foss-2023b.eb +++ b/easybuild/easyconfigs/c/casacore/casacore-3.5.0-foss-2023b.eb @@ -37,7 +37,7 @@ dependencies = [ configopts = '-DBUILD_PYTHON=NO -DBUILD_PYTHON3=YES -Wno-dev -DCXX11="ON" ' configopts += '-DDATA_DIR=%(installdir)s/data -DUSE_OPENMP=ON -DUSE_HDF5=ON ' -configopts += '-DUSE_MPI=ON -DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python ' +configopts += '-DUSE_MPI=ON ' local_download_cmd = 'wget --retry-connrefused ftp://anonymous@ftp.astron.nl/outgoing/Measures/WSRT_Measures.ztar ' local_download_cmd += '-O /tmp/WSRT_Measures.ztar ' @@ -49,7 +49,11 @@ postinstallcmds = [ ] sanity_check_paths = { - 'files': ['lib/libcasa_casa.so', 'lib/libcasa_mirlib.so', 'lib/libcasa_ms.so'], + 'files': [ + 'lib/libcasa_casa.%s' % SHLIB_EXT, + 'lib/libcasa_mirlib.%s' % SHLIB_EXT, + 'lib/libcasa_ms.%s' % SHLIB_EXT, + ], 'dirs': ['bin', 'include/%(name)s'], } diff --git a/easybuild/easyconfigs/d/DP3/DP3-6.0-foss-2023b.eb b/easybuild/easyconfigs/d/DP3/DP3-6.0-foss-2023b.eb index d04a9372e56..03532ba746d 100644 --- a/easybuild/easyconfigs/d/DP3/DP3-6.0-foss-2023b.eb +++ b/easybuild/easyconfigs/d/DP3/DP3-6.0-foss-2023b.eb @@ -38,11 +38,6 @@ 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/%(namelower)s/base/%(name)s.h', 'bin/%(name)s'], diff --git a/easybuild/easyconfigs/e/EveryBeam/EveryBeam-0.5.2-foss-2023b.eb b/easybuild/easyconfigs/e/EveryBeam/EveryBeam-0.5.2-foss-2023b.eb index 3f97c345d82..6192a7ace66 100644 --- a/easybuild/easyconfigs/e/EveryBeam/EveryBeam-0.5.2-foss-2023b.eb +++ b/easybuild/easyconfigs/e/EveryBeam/EveryBeam-0.5.2-foss-2023b.eb @@ -38,14 +38,9 @@ dependencies = [ ('libxml2', '2.11.5'), ] -# 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/%(name)s/beamformer.h', 'lib/libeverybeam.so'], + 'files': ['include/%(name)s/beamformer.h', 'lib/libeverybeam.%s' % SHLIB_EXT], 'dirs': [], } diff --git a/easybuild/easyconfigs/l/libidn2/libidn2-2.3.2-GCCcore-13.2.0.eb b/easybuild/easyconfigs/l/libidn2/libidn2-2.3.2-GCCcore-13.2.0.eb index 662ff77ec42..042215912d5 100644 --- a/easybuild/easyconfigs/l/libidn2/libidn2-2.3.2-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/l/libidn2/libidn2-2.3.2-GCCcore-13.2.0.eb @@ -18,7 +18,7 @@ builddependencies = [ sanity_check_paths = { - 'files': ['bin/idn2', 'lib/%(name)s.so'], + 'files': ['bin/idn2', 'lib/%(name)s.%s' % SHLIB_EXT], 'dirs': ['include'], } diff --git a/easybuild/easyconfigs/p/PCRE/PCRE-8.45-GCCcore-13.2.0.eb b/easybuild/easyconfigs/p/PCRE/PCRE-8.45-GCCcore-13.2.0.eb index ca479a2ca85..6815128938a 100644 --- a/easybuild/easyconfigs/p/PCRE/PCRE-8.45-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/p/PCRE/PCRE-8.45-GCCcore-13.2.0.eb @@ -27,12 +27,15 @@ dependencies = [ ('zlib', '1.2.13'), ] -configopts = " --enable-utf --enable-unicode-properties --enable-pcre16 --enable-pcre32" +configopts = "--enable-utf --enable-unicode-properties --enable-pcre16 --enable-pcre32" sanity_check_paths = { 'files': [ - 'bin/%(namelower)s-config', 'include/%(namelower)s.h', 'share/man/man3/%(namelower)s.3', 'lib/libpcre32.so' + 'bin/%(namelower)s-config', + 'include/%(namelower)s.h', + 'share/man/man3/%(namelower)s.3', + 'lib/libpcre32.%s' % SHLIB_EXT ], 'dirs': ['lib/pkgconfig', 'share/doc/%(namelower)s/html', 'share/man/man1'], } diff --git a/easybuild/easyconfigs/p/PGPLOT/PGPLOT-5.2.2-GCCcore-13.2.0.eb b/easybuild/easyconfigs/p/PGPLOT/PGPLOT-5.2.2-GCCcore-13.2.0.eb index bc1093a8a5c..d2e3d25fb6d 100644 --- a/easybuild/easyconfigs/p/PGPLOT/PGPLOT-5.2.2-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/p/PGPLOT/PGPLOT-5.2.2-GCCcore-13.2.0.eb @@ -31,10 +31,10 @@ dependencies = [ # create .so symlinks for shared libraries postinstallcmds = [ - "cd %(installdir)s/lib && ln -s libcpgplot.so.%(version)s libcpgplot.so.5", - "cd %(installdir)s/lib && ln -s libcpgplot.so.%(version)s libcpgplot.so", - "cd %(installdir)s/lib && ln -s libpgplot.so.%(version)s libpgplot.so.5", - "cd %(installdir)s/lib && ln -s libpgplot.so.%(version)s libpgplot.so", + "cd %(installdir)s/lib && ln -s libcpgplot.%s.%(version)s libcpgplot.%s.5" % SHLIB_EXT, + "cd %(installdir)s/lib && ln -s libcpgplot.%s.%(version)s libcpgplot.%s" % SHLIB_EXT, + "cd %(installdir)s/lib && ln -s libpgplot.%s.%(version)s libpgplot.%s.5" % SHLIB_EXT, + "cd %(installdir)s/lib && ln -s libpgplot.%s.%(version)s libpgplot.%s" % SHLIB_EXT, ] files_to_copy = [ (['pgdemo*'], 'bin'), @@ -45,7 +45,13 @@ files_to_copy = [ cmds_map = [('.*', './makemake . linux g77_gcc && make && make shared && make cpg && make cpg-shared')] sanity_check_paths = { - 'files': ['include/cpgplot.h', 'lib/libpgplot.a', 'lib/libcpgplot.a', 'lib/libpgplot.so', 'lib/libcpgplot.so'], + 'files': [ + 'include/cpgplot.h', + 'lib/libpgplot.a', + 'lib/libcpgplot.a', + 'lib/libpgplot.%s' % SHLIB_EXT, + 'lib/libcpgplot.%s' % SHLIB_EXT + ], 'dirs': ['bin'], } diff --git a/easybuild/easyconfigs/w/WCSLIB/WCSLIB-7.11-GCC-13.2.0.eb b/easybuild/easyconfigs/w/WCSLIB/WCSLIB-7.11-GCC-13.2.0.eb index 98d3625f685..4a6ebb8aacf 100644 --- a/easybuild/easyconfigs/w/WCSLIB/WCSLIB-7.11-GCC-13.2.0.eb +++ b/easybuild/easyconfigs/w/WCSLIB/WCSLIB-7.11-GCC-13.2.0.eb @@ -30,7 +30,7 @@ configopts = "--with-cfitsiolib=$EBROOTCFITSIO/lib --with-cfitsioinc=$EBROOTCFIT configopts += "--with-pgplotlib=$EBROOTPGPLOT/lib --with-pgplotinc=$EBROOTPGPLOT/include " sanity_check_paths = { - 'files': ['bin/wcsgrid', 'bin/wcsware', 'lib/libpgsbox-%(version)s.a', 'lib/libpgsbox.so'], + 'files': ['bin/wcsgrid', 'bin/wcsware', 'lib/libpgsbox-%(version)s.a', 'lib/libpgsbox.%s' % SHLIB_EXT], 'dirs': ['include'], } diff --git a/easybuild/easyconfigs/w/WSClean/WSClean-3.4-foss-2023b.eb b/easybuild/easyconfigs/w/WSClean/WSClean-3.4-foss-2023b.eb index 1b02e0161d8..9be780efeb3 100644 --- a/easybuild/easyconfigs/w/WSClean/WSClean-3.4-foss-2023b.eb +++ b/easybuild/easyconfigs/w/WSClean/WSClean-3.4-foss-2023b.eb @@ -32,11 +32,6 @@ dependencies = [ ('Python', '3.11.5'), ] -# 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/%(namelower)s'],