From e87d7a1a65cf9118154fce8cc1e091d3df3b8c63 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 29 Mar 2024 03:50:41 +0800 Subject: [PATCH] [superlu] update to 6.0.1 (#37790) --- ports/superlu/portfile.cmake | 3 ++- ports/superlu/remove-make.inc.patch | 6 +++--- ports/superlu/superfluous-configure.patch | 8 ++++---- ports/superlu/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/superlu.json | 5 +++++ 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/ports/superlu/portfile.cmake b/ports/superlu/portfile.cmake index 0cf6056ba3..6b0bcc9b81 100644 --- a/ports/superlu/portfile.cmake +++ b/ports/superlu/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiaoyeli/superlu REF "v${VERSION}" - SHA512 8feeb08404cad58724f0f6478bc785b56d8c725b549f1fdc07d3578c4e14bdbdbd8bcda1cdfd366a39417eda60765825e87cf781c68e6723a8246cb357b41439 + SHA512 6dd2baeff9ca7ed4761845b9a30c6dca4e19ca498e10ea7360013b3aece576ca996a8bf31c4479321feda6f5266235d68ea9a2e256f0ffe91f804d4cdecd3847 HEAD_REF master PATCHES remove-make.inc.patch @@ -20,6 +20,7 @@ vcpkg_cmake_configure( -Denable_tests=OFF -Denable_internal_blaslib=OFF -Denable_doc=OFF + -Denable_examples=OFF ) vcpkg_cmake_install() diff --git a/ports/superlu/remove-make.inc.patch b/ports/superlu/remove-make.inc.patch index 8f7716aadd..3652520e22 100644 --- a/ports/superlu/remove-make.inc.patch +++ b/ports/superlu/remove-make.inc.patch @@ -1,12 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b414f5f..22f29ce 100644 +index d059e89..fb0fb46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -155,7 +155,6 @@ endif() +@@ -234,7 +234,6 @@ add_subdirectory(DOC) # file(WRITE "make.defs" "# can be exposed to users" # ${CMAKE_C_COMPILER} ) # configure_file(${CMAKE_SOURCE_DIR}/make.inc.in ${CMAKE_SOURCE_DIR}/make.inc) -configure_file(${SuperLU_SOURCE_DIR}/make.inc.in ${SuperLU_SOURCE_DIR}/make.inc) - + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/superlu.pc.in ${CMAKE_CURRENT_BINARY_DIR}/superlu.pc @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/superlu.pc diff --git a/ports/superlu/superfluous-configure.patch b/ports/superlu/superfluous-configure.patch index 09b974be19..3505f0bfc0 100644 --- a/ports/superlu/superfluous-configure.patch +++ b/ports/superlu/superfluous-configure.patch @@ -1,10 +1,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index d733990..11f429a 100644 +index fb0fb46..772f56c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -230,7 +230,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/superlu.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - +@@ -240,7 +240,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/superlu.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + configure_file(${SuperLU_SOURCE_DIR}/SRC/superlu_config.h.in ${SuperLU_BINARY_DIR}/SRC/superlu_config.h) -configure_file(${SuperLU_SOURCE_DIR}/SRC/superlu_config.h.in ${SuperLU_SOURCE_DIR}/SRC/superlu_config.h) diff --git a/ports/superlu/vcpkg.json b/ports/superlu/vcpkg.json index a9d521ae33..c18a7d8925 100644 --- a/ports/superlu/vcpkg.json +++ b/ports/superlu/vcpkg.json @@ -1,6 +1,6 @@ { "name": "superlu", - "version": "6.0.0", + "version": "6.0.1", "description": "Supernodal sparse direct solver.", "homepage": "https://github.com/xiaoyeli/superlu", "license": "BSD-3-Clause-LBNL", diff --git a/versions/baseline.json b/versions/baseline.json index a091ae5c76..efe6de0537 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8445,7 +8445,7 @@ "port-version": 0 }, "superlu": { - "baseline": "6.0.0", + "baseline": "6.0.1", "port-version": 0 }, "swenson-sort": { diff --git a/versions/s-/superlu.json b/versions/s-/superlu.json index 45548e8cd1..f07d4f499d 100644 --- a/versions/s-/superlu.json +++ b/versions/s-/superlu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ae6007b0b5334eb0dc0e8ee97e8c24355a77323", + "version": "6.0.1", + "port-version": 0 + }, { "git-tree": "8187a877fbae6bdc54d5922753a1d67141576be0", "version": "6.0.0",