Merge pull request #5525 from kafeg/master

[clapack] Fix linux build

5 files changed, 60 insertions, 5 deletions

diff --git a/ports/clapack/CONTROL b/ports/clapack/CONTROL
index c30f5eb95..284e6372c 100644
--- a/ports/clapack/CONTROL
+++ b/ports/clapack/CONTROL
@@ -1,4 +1,4 @@
 Source: clapack
-Version: 3.2.1-2
+Version: 3.2.1-3
 Description: CLAPACK (f2c'ed version of LAPACK)
 Build-Depends: openblas
diff --git a/ports/clapack/fix-linux-build.patch b/ports/clapack/fix-linux-build.patch
new file mode 100644
index 000000000..230fa9bf6
--- /dev/null
+++ b/ports/clapack/fix-linux-build.patch
@@ -0,0 +1,46 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8c53def..9e0e398 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,10 +1,10 @@
+ cmake_minimum_required(VERSION 2.6)
+ project(CLAPACK C)
+-enable_testing()
++#enable_testing()
+ include(CTest)
+ 
+ # BLAS_LIBRARIES
+-find_package(BLAS REQUIRED)
++find_package(OpenBLAS REQUIRED)
+ 
+ if(WIN32 AND NOT CYGWIN)
+   set(SECOND_SRC  ${CLAPACK_SOURCE_DIR}/INSTALL/winsecond.c)
+@@ -14,7 +14,7 @@ else()
+   set(SECOND_SRC  ${CLAPACK_SOURCE_DIR}/INSTALL/second.c)
+   set(DSECOND_SRC  ${CLAPACK_SOURCE_DIR}/INSTALL/dsecnd.c)
+ endif()
+-enable_testing()
++#enable_testing()
+ option(USE_BLAS_WRAP "pre-pend f2c_ to each function in blas" OFF)
+ if(NOT USE_BLAS_WRAP)
+ # _zrotg_ seems to be missing in the wrap header
+@@ -25,7 +25,7 @@ add_subdirectory(F2CLIBS)
+ 
+ # add_subdirectory(BLAS)
+ add_subdirectory(SRC)
+-add_subdirectory(TESTING)
++#add_subdirectory(TESTING)
+ set(CLAPACK_VERSION 3.2.1)
+ set(CPACK_PACKAGE_VERSION_MAJOR 3)
+ set(CPACK_PACKAGE_VERSION_MINOR 2)
+@@ -38,6 +38,6 @@ include(CPack)
+ #   ${CLAPACK_BINARY_DIR}/clapack-config.cmake @ONLY)
+ 
+ install(FILES 
+-          ${CMAKE_CURRENT_LIST_DIR}/include/clapack.h
+-          ${CMAKE_CURRENT_LIST_DIR}/include/f2c.h 
+-        DESTINATION include)
+\ No newline at end of file
++          ${CMAKE_CURRENT_LIST_DIR}/INCLUDE/clapack.h
++          ${CMAKE_CURRENT_LIST_DIR}/INCLUDE/f2c.h
++        DESTINATION include)
diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake
index 9e67594f9..ec0eee40a 100644
--- a/ports/clapack/portfile.cmake
+++ b/ports/clapack/portfile.cmake
@@ -34,6 +34,13 @@ vcpkg_apply_patches(
         fix-lack-library.patch
 )
 
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    vcpkg_apply_patches(
+        SOURCE_PATH ${SOURCE_PATH}
+        PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-linux-build.patch"
+    )
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
 
diff --git a/ports/openblas/CONTROL b/ports/openblas/CONTROL
index 980b87fb6..c7f019185 100644
--- a/ports/openblas/CONTROL
+++ b/ports/openblas/CONTROL
@@ -1,3 +1,3 @@
 Source: openblas
-Version: 0.3.5-1
+Version: 0.3.5-2
 Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.
diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake
index 8ea8665e9..dae730b6f 100644
--- a/ports/openblas/portfile.cmake
+++ b/ports/openblas/portfile.cmake
@@ -16,9 +16,11 @@ if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
     message(FATAL_ERROR "openblas can only be built for x64 currently")
 endif()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    message("openblas currenly only supports dynamic library linkage")
-    set(VCPKG_LIBRARY_LINKAGE "dynamic")
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        message("openblas currenly only supports dynamic library linkage")
+        set(VCPKG_LIBRARY_LINKAGE "dynamic")
+    endif()
 endif()
 
 vcpkg_from_github(