diff --git a/build_lofar.sh.config.rrz b/build_lofar.sh.config.rrz index 82988e7087fa0dcd9119cf154f0b685847cb9b1c..5c7668f5a2f3d8820dddd6aacc6aa83ae68f2f6b 100644 --- a/build_lofar.sh.config.rrz +++ b/build_lofar.sh.config.rrz @@ -14,7 +14,7 @@ casacore_version=3.3.0 dysco_version=1.2.0 pybdsf_version=latest # weird C++ template error with 1.8.12 pycasa_version=3.1.1 -wsclean_version=3.0 #2.10.1 +wsclean_version=3.0.1 #2.10.1 dp3_version=5.2 # This gives us CUDA, gcc, Open MPI and dependencies diff --git a/wsclean-buildfix.patch b/wsclean-buildfix.patch index a2b30edad5f92758be7652bf9c530345309e9a5e..c77b695bf65193886fd83f6f7d648965a4d9d85f 100644 --- a/wsclean-buildfix.patch +++ b/wsclean-buildfix.patch @@ -1,10 +1,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 13376e9..c0bf13b 100644 +index 040c3bf..5c2b01b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -105,9 +105,22 @@ find_library(FFTW3F_LIB fftw3f REQUIRED) - find_library(FFTW3F_THREADS_LIB fftw3f_threads REQUIRED) - find_path(FFTW3_INCLUDE_DIR NAMES fftw3.h) +@@ -116,9 +116,22 @@ find_path( + NAMES fftw3.h + HINTS ENV FFTW3_INCLUDE) -find_package(PythonLibs 3 REQUIRED) -find_package(PythonInterp REQUIRED) @@ -27,3 +27,14 @@ index 13376e9..c0bf13b 100644 # Include pybind11 add_subdirectory("${CMAKE_SOURCE_DIR}/external/pybind11") +@@ -373,8 +386,8 @@ set(ALL_LIBRARIES + schaapcommon) + + # Perform the BLAS check from aocommon +-include("${CMAKE_CURRENT_LIST_DIR}/external/aocommon/CMake/CheckBLAS.cmake") +-check_blas(LIBRARIES ${ALL_LIBRARIES}) ++#include("${CMAKE_CURRENT_LIST_DIR}/external/aocommon/CMake/CheckBLAS.cmake") ++#check_blas(LIBRARIES ${ALL_LIBRARIES}) + + add_library(wsclean-lib STATIC ${WSCLEANFILES}) + target_link_libraries(wsclean-lib PRIVATE pybind11::embed ${ALL_LIBRARIES})