diff --git a/mingw-w64-arpack/0002-cmake-set-SUFFIX64.patch b/mingw-w64-arpack/0002-cmake-set-SUFFIX64.patch index d46d934531..2503960eda 100644 --- a/mingw-w64-arpack/0002-cmake-set-SUFFIX64.patch +++ b/mingw-w64-arpack/0002-cmake-set-SUFFIX64.patch @@ -1,17 +1,26 @@ diff -urN arpack-ng-3.8.0_orig/CMakeLists.txt arpack-ng-3.8.0/CMakeLists.txt --- arpack-ng-3.8.0_orig/CMakeLists.txt 2020-12-07 11:40:45.000000000 +0100 -+++ arpack-ng-3.8.0/CMakeLists.txt 2021-12-09 09:55:07.736791800 +0100 -@@ -709,6 +709,9 @@ - configure_file(PARPACK/SRC/MPI/parpack.pc.in "${PROJECT_BINARY_DIR}/PARPACK/SRC/MPI/parpack${LIBSUFFIX}.pc" @ONLY) - configure_file(EXAMPLES/MATRIX_MARKET/arpackSolver.pc.in "${PROJECT_BINARY_DIR}/EXAMPLES/MATRIX_MARKET/arpackSolver.pc" @ONLY) ++++ arpack-ng-3.8.0/CMakeLists.txt 2022-01-26 13:38:30.619004400 +0100 +@@ -678,6 +678,10 @@ + # 'make install' to the correct location + include(GNUInstallDirs) +if (INTERFACE64) + set(SUFFIX64 64) +endif() ++ + # Convert variable names to those expected by the .pc file. + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix \${prefix}) +@@ -709,7 +713,6 @@ + configure_file(PARPACK/SRC/MPI/parpack.pc.in "${PROJECT_BINARY_DIR}/PARPACK/SRC/MPI/parpack${LIBSUFFIX}.pc" @ONLY) + configure_file(EXAMPLES/MATRIX_MARKET/arpackSolver.pc.in "${PROJECT_BINARY_DIR}/EXAMPLES/MATRIX_MARKET/arpackSolver.pc" @ONLY) +- install(TARGETS arpack ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -@@ -727,41 +731,41 @@ + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +@@ -727,41 +730,41 @@ endif () if(ICB) @@ -68,3 +77,24 @@ diff -urN arpack-ng-3.8.0_orig/CMakeLists.txt arpack-ng-3.8.0/CMakeLists.txt # Packaging: ease arpack-ng distribution (precompiled binaries and sources tarballs). set(CPACK_VERSION_MAJOR "${arpack_ng_MAJOR_VERSION}") +diff -urN arpack-ng-3.8.0_orig/SRC/arpack.pc.in arpack-ng-3.8.0/SRC/arpack.pc.in +--- arpack-ng-3.8.0_orig/SRC/arpack.pc.in 2020-12-07 11:40:45.000000000 +0100 ++++ arpack-ng-3.8.0/SRC/arpack.pc.in 2022-01-26 13:30:20.592994600 +0100 +@@ -9,4 +9,4 @@ + URL: @PACKAGE_URL@ + Libs: -L${libdir} -larpack@LIBSUFFIX@ + Libs.private: @ARPACK_PC_LIBS_PRIVATE@ +-Cflags: -I${includedir}/arpack ++Cflags: -I${includedir}/arpack@SUFFIX64@ +diff -urN arpack-ng-3.8.0_orig/arpack-ng-config.cmake.in arpack-ng-3.8.0/arpack-ng-config.cmake.in +--- arpack-ng-3.8.0_orig/arpack-ng-config.cmake.in 2020-12-07 11:40:45.000000000 +0100 ++++ arpack-ng-3.8.0/arpack-ng-config.cmake.in 2022-01-24 09:38:46.168679800 +0100 +@@ -19,7 +19,7 @@ + + # Create arpack targets. + add_library(ARPACK::ARPACK INTERFACE IMPORTED) +-set_target_properties(ARPACK::ARPACK PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${includedir}/arpack") ++set_target_properties(ARPACK::ARPACK PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${includedir}/arpack${SUFFIX64}") + set_target_properties(ARPACK::ARPACK PROPERTIES INTERFACE_LINK_LIBRARIES "arpack") + add_library(PARPACK::PARPACK INTERFACE IMPORTED) + set_target_properties(PARPACK::PARPACK PROPERTIES INTERFACE_LINK_LIBRARIES "parpack")