diff --git a/ports/superlu/fix-libm.patch b/ports/superlu/fix-libm.patch deleted file mode 100644 index a356bbda28..0000000000 --- a/ports/superlu/fix-libm.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt -index e627f06..9aa8949 100644 ---- a/SRC/CMakeLists.txt -+++ b/SRC/CMakeLists.txt -@@ -232,7 +232,11 @@ if(enable_complex16) - endif() - - add_library(superlu ${sources} ${HEADERS}) --target_link_libraries(superlu PUBLIC ${BLAS_LIB} m) -+if(CMAKE_SYSTEM_NAME STREQUAL "Windows") -+ target_link_libraries(superlu PUBLIC ${BLAS_LIB}) -+else() -+ target_link_libraries(superlu PUBLIC ${BLAS_LIB} m) -+endif() - target_include_directories(superlu PUBLIC - $ - $ diff --git a/ports/superlu/portfile.cmake b/ports/superlu/portfile.cmake index 7ffea59ad1..e1c25cf344 100644 --- a/ports/superlu/portfile.cmake +++ b/ports/superlu/portfile.cmake @@ -5,11 +5,10 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiaoyeli/superlu - REF a3d5233770f0caad4bc4578b46d3b26af99e9c19 - SHA512 c07e64be51ddef7774a367e1309ef4e596e93571531ec58a0c7b9db60a3db8b3a4a8b1262d66fcd512ad467db5df59a3726db342b259e392a08f56f5dd67c6ef + REF v${VERSION} + SHA512 1461b52bc18a8b0345beb70fdd46e07df497a13be840bcc061158ea1d0e61c8745806d1ad21cb2723db80f5ed762c3741f9c0ded2b2013df46da0e8bb6b77b83 HEAD_REF master PATCHES - fix-libm.patch remove-make.inc.patch ) diff --git a/ports/superlu/vcpkg.json b/ports/superlu/vcpkg.json index 2428d96f06..561f75beb8 100644 --- a/ports/superlu/vcpkg.json +++ b/ports/superlu/vcpkg.json @@ -1,11 +1,9 @@ { "name": "superlu", - "version-date": "2020-01-07", - "port-version": 6, + "version": "5.3.0", "description": "Supernodal sparse direct solver.", "homepage": "https://github.com/xiaoyeli/superlu", - "license": "BSD-4-Clause-UC", - "supports": "!(uwp | arm)", + "license": "BSD-3-Clause-LBNL", "dependencies": [ "blas", { diff --git a/versions/baseline.json b/versions/baseline.json index 447a0eb6d9..a70c923fbe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7493,8 +7493,8 @@ "port-version": 0 }, "superlu": { - "baseline": "2020-01-07", - "port-version": 6 + "baseline": "5.3.0", + "port-version": 0 }, "symengine": { "baseline": "0.9.0", diff --git a/versions/s-/superlu.json b/versions/s-/superlu.json index 05a897d68f..112654891a 100644 --- a/versions/s-/superlu.json +++ b/versions/s-/superlu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70b5d8ecd8bdca0344fc176833037b95b116219e", + "version": "5.3.0", + "port-version": 0 + }, { "git-tree": "6b8a53560265803d6b0b5b284b88abf0ae48650d", "version-date": "2020-01-07",