From 270533a0d267f3cf80688b01b17e899a37d5593b Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Fri, 3 Mar 2023 21:36:37 +0100 Subject: [PATCH] Fix klu64 libraries --- sundials-klu64.patch | 39 +++++++++++++++++++++++++++++++++++++++ sundials.spec | 6 ++++++ 2 files changed, 45 insertions(+) create mode 100644 sundials-klu64.patch diff --git a/sundials-klu64.patch b/sundials-klu64.patch new file mode 100644 index 0000000..478f1cb --- /dev/null +++ b/sundials-klu64.patch @@ -0,0 +1,39 @@ +--- a/cmake/tpl/FindKLU.orig.cmake 2021-09-30 21:05:25.000000000 +0200 ++++ b/cmake/tpl/FindKLU.cmake 2023-03-03 21:28:45.354177379 +0100 +@@ -54,31 +54,31 @@ + + else () + # find library with user provided directory path +- set(KLU_LIBRARY_NAME klu) ++ set(KLU_LIBRARY_NAME klu64) + find_library(KLU_LIBRARY ${KLU_LIBRARY_NAME} ${KLU_LIBRARY_DIR} NO_DEFAULT_PATH) + endif () + mark_as_advanced(KLU_LIBRARY) + + if (NOT AMD_LIBRARY) +- set(AMD_LIBRARY_NAME amd) ++ set(AMD_LIBRARY_NAME amd64) + find_library(AMD_LIBRARY ${AMD_LIBRARY_NAME} ${KLU_LIBRARY_DIR} NO_DEFAULT_PATH) + mark_as_advanced(AMD_LIBRARY) + endif () + + if (NOT COLAMD_LIBRARY) +- set(COLAMD_LIBRARY_NAME colamd) ++ set(COLAMD_LIBRARY_NAME colamd64) + find_library(COLAMD_LIBRARY ${COLAMD_LIBRARY_NAME} ${KLU_LIBRARY_DIR} NO_DEFAULT_PATH) + mark_as_advanced(COLAMD_LIBRARY) + endif () + + if (NOT BTF_LIBRARY) +- set(BTF_LIBRARY_NAME btf) ++ set(BTF_LIBRARY_NAME btf64) + find_library( BTF_LIBRARY ${BTF_LIBRARY_NAME} ${KLU_LIBRARY_DIR} NO_DEFAULT_PATH) + mark_as_advanced(BTF_LIBRARY) + endif () + + if (NOT SUITESPARSECONFIG_LIBRARY) +- set(SUITESPARSECONFIG_LIBRARY_NAME suitesparseconfig) ++ set(SUITESPARSECONFIG_LIBRARY_NAME suitesparseconfig64) + # NOTE: no prefix for this library on windows + if(WIN32 AND NOT MSYS) + set(CMAKE_FIND_LIBRARY_PREFIXES "") diff --git a/sundials.spec b/sundials.spec index faaf1eb..68c24a1 100644 --- a/sundials.spec +++ b/sundials.spec @@ -89,6 +89,7 @@ Patch0: %{name}-5.5.0-set_superlumt_name.patch Patch1: %{name}-5.5.0-set_superlumt64_name.patch Patch2: %{name}-change_petsc_variable.patch +Patch3: %{name}-klu64.patch BuildRequires: make %if 0%{?with_fortran} @@ -236,6 +237,10 @@ pushd %{name}-%{version} %patch0 -p0 -b .set_superlumt_name %endif +%if 0%{?with_klu64} +%patch3 -p1 -b .klu64 +%endif + mv src/arkode/README.md src/README-arkode.md mv src/cvode/README.md src/README-cvode.md mv src/cvodes/README.md src/README-cvodes.md @@ -266,6 +271,7 @@ export LIBSUPERLUMTLINK=-lsuperlumt_d %endif %endif + %if %{with debug} %undefine _hardened_build export CFLAGS=" "