[packages/sundials] - updated to 3.1.1 (new sonames)
qboosh
qboosh at pld-linux.org
Sun Jan 22 19:08:22 CET 2023
commit ae7c7d3c31de2d98cda2dbda2d6a936d606f4eb9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jan 22 19:09:37 2023 +0100
- updated to 3.1.1 (new sonames)
sundials-cmake.patch | 135 +++++++++++----------------------------------------
sundials.spec | 122 ++++++++++++++++++++++++++++++++++++++++------
2 files changed, 133 insertions(+), 124 deletions(-)
---
diff --git a/sundials.spec b/sundials.spec
index 5fb0285..9bc4b04 100644
--- a/sundials.spec
+++ b/sundials.spec
@@ -9,13 +9,13 @@
Summary: SUite of Nonlinear and DIfferential/ALgebraic equation Solvers
Summary(pl.UTF-8): Zbiór procedur do rozwiązywania równań nieliniowych i różniczkowych/algebraicznych
Name: sundials
-Version: 2.7.0
+Version: 3.1.1
Release: 1
License: BSD
Group: Libraries
#Source0Download: https://computing.llnl.gov/projects/sundials/sundials-software
Source0: https://github.com/LLNL/sundials/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: b1724826fe7289164264750377e52664
+# Source0-md5: 22047ccec82ae7bcfe0ee51f68f70d56
Patch0: %{name}-cmake.patch
URL: https://computing.llnl.gov/projects/sundials
BuildRequires: SuiteSparse-KLU-devel
@@ -124,7 +124,7 @@ cd build
-DKLU_INCLUDE_DIR=%{_includedir}/suitesparse \
-DKLU_LIBRARY_DIR=%{_libdir} \
-DLAPACK_ENABLE=ON \
- %{?with_openmp:-DOPENMP_ENABLE=ON} \
+ %{?with_openmp:-DOPENMP_ENABLE=ON -DOpenMP_gcc_s_LIBRARY=/%{_lib}/libgcc_s.so} \
-DPTHREAD_ENABLE=ON
%{__make}
@@ -143,36 +143,80 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc LICENSE README
+%doc LICENSE README.md
%attr(755,root,root) %{_libdir}/libsundials_arkode.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsundials_arkode.so.1
+%attr(755,root,root) %ghost %{_libdir}/libsundials_arkode.so.2
%attr(755,root,root) %{_libdir}/libsundials_cvode.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsundials_cvode.so.2
+%attr(755,root,root) %ghost %{_libdir}/libsundials_cvode.so.3
%attr(755,root,root) %{_libdir}/libsundials_cvodes.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsundials_cvodes.so.2
+%attr(755,root,root) %ghost %{_libdir}/libsundials_cvodes.so.3
%attr(755,root,root) %{_libdir}/libsundials_ida.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsundials_ida.so.2
+%attr(755,root,root) %ghost %{_libdir}/libsundials_ida.so.3
%attr(755,root,root) %{_libdir}/libsundials_idas.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsundials_idas.so.1
+%attr(755,root,root) %ghost %{_libdir}/libsundials_idas.so.2
%attr(755,root,root) %{_libdir}/libsundials_kinsol.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsundials_kinsol.so.2
+%attr(755,root,root) %ghost %{_libdir}/libsundials_kinsol.so.3
%if %{with openmp}
%attr(755,root,root) %{_libdir}/libsundials_nvecopenmp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsundials_nvecopenmp.so.2
+%attr(755,root,root) %ghost %{_libdir}/libsundials_nvecopenmp.so.3
%endif
%attr(755,root,root) %{_libdir}/libsundials_nvecpthreads.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsundials_nvecpthreads.so.2
+%attr(755,root,root) %ghost %{_libdir}/libsundials_nvecpthreads.so.3
%attr(755,root,root) %{_libdir}/libsundials_nvecserial.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsundials_nvecserial.so.2
+%attr(755,root,root) %ghost %{_libdir}/libsundials_nvecserial.so.3
+%attr(755,root,root) %{_libdir}/libsundials_sunlinsolband.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_sunlinsolband.so.1
+%attr(755,root,root) %{_libdir}/libsundials_sunlinsoldense.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_sunlinsoldense.so.1
+%attr(755,root,root) %{_libdir}/libsundials_sunlinsolklu.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_sunlinsolklu.so.1
+%attr(755,root,root) %{_libdir}/libsundials_sunlinsolpcg.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_sunlinsolpcg.so.1
+%attr(755,root,root) %{_libdir}/libsundials_sunlinsolspbcgs.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_sunlinsolspbcgs.so.1
+%attr(755,root,root) %{_libdir}/libsundials_sunlinsolspfgmr.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_sunlinsolspfgmr.so.1
+%attr(755,root,root) %{_libdir}/libsundials_sunlinsolspgmr.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_sunlinsolspgmr.so.1
+%attr(755,root,root) %{_libdir}/libsundials_sunlinsolsptfqmr.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_sunlinsolsptfqmr.so.1
+%attr(755,root,root) %{_libdir}/libsundials_sunmatrixband.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_sunmatrixband.so.1
+%attr(755,root,root) %{_libdir}/libsundials_sunmatrixdense.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_sunmatrixdense.so.1
+%attr(755,root,root) %{_libdir}/libsundials_sunmatrixsparse.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_sunmatrixsparse.so.1
# Fortran - shared
%if %{with openmp}
%attr(755,root,root) %{_libdir}/libsundials_fnvecopenmp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsundials_fnvecopenmp.so.2
+%attr(755,root,root) %ghost %{_libdir}/libsundials_fnvecopenmp.so.3
%endif
%attr(755,root,root) %{_libdir}/libsundials_fnvecpthreads.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsundials_fnvecpthreads.so.2
+%attr(755,root,root) %ghost %{_libdir}/libsundials_fnvecpthreads.so.3
%attr(755,root,root) %{_libdir}/libsundials_fnvecserial.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsundials_fnvecserial.so.2
+%attr(755,root,root) %ghost %{_libdir}/libsundials_fnvecserial.so.3
+%attr(755,root,root) %{_libdir}/libsundials_fsunlinsolband.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_fsunlinsolband.so.1
+%attr(755,root,root) %{_libdir}/libsundials_fsunlinsoldense.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_fsunlinsoldense.so.1
+%attr(755,root,root) %{_libdir}/libsundials_fsunlinsolklu.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_fsunlinsolklu.so.1
+%attr(755,root,root) %{_libdir}/libsundials_fsunlinsolpcg.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_fsunlinsolpcg.so.1
+%attr(755,root,root) %{_libdir}/libsundials_fsunlinsolspbcgs.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_fsunlinsolspbcgs.so.1
+%attr(755,root,root) %{_libdir}/libsundials_fsunlinsolspfgmr.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_fsunlinsolspfgmr.so.1
+%attr(755,root,root) %{_libdir}/libsundials_fsunlinsolspgmr.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_fsunlinsolspgmr.so.1
+%attr(755,root,root) %{_libdir}/libsundials_fsunlinsolsptfqmr.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_fsunlinsolsptfqmr.so.1
+%attr(755,root,root) %{_libdir}/libsundials_fsunmatrixband.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_fsunmatrixband.so.1
+%attr(755,root,root) %{_libdir}/libsundials_fsunmatrixdense.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_fsunmatrixdense.so.1
+%attr(755,root,root) %{_libdir}/libsundials_fsunmatrixsparse.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsundials_fsunmatrixsparse.so.1
%files devel
%defattr(644,root,root,755)
@@ -187,12 +231,34 @@ rm -rf $RPM_BUILD_ROOT
%endif
%attr(755,root,root) %{_libdir}/libsundials_nvecpthreads.so
%attr(755,root,root) %{_libdir}/libsundials_nvecserial.so
+%attr(755,root,root) %{_libdir}/libsundials_sunlinsolband.so
+%attr(755,root,root) %{_libdir}/libsundials_sunlinsoldense.so
+%attr(755,root,root) %{_libdir}/libsundials_sunlinsolklu.so
+%attr(755,root,root) %{_libdir}/libsundials_sunlinsolpcg.so
+%attr(755,root,root) %{_libdir}/libsundials_sunlinsolspbcgs.so
+%attr(755,root,root) %{_libdir}/libsundials_sunlinsolspfgmr.so
+%attr(755,root,root) %{_libdir}/libsundials_sunlinsolspgmr.so
+%attr(755,root,root) %{_libdir}/libsundials_sunlinsolsptfqmr.so
+%attr(755,root,root) %{_libdir}/libsundials_sunmatrixband.so
+%attr(755,root,root) %{_libdir}/libsundials_sunmatrixdense.so
+%attr(755,root,root) %{_libdir}/libsundials_sunmatrixsparse.so
# Fortran - shared
%if %{with openmp}
%attr(755,root,root) %{_libdir}/libsundials_fnvecopenmp.so
%endif
%attr(755,root,root) %{_libdir}/libsundials_fnvecpthreads.so
%attr(755,root,root) %{_libdir}/libsundials_fnvecserial.so
+%attr(755,root,root) %{_libdir}/libsundials_fsunlinsolband.so
+%attr(755,root,root) %{_libdir}/libsundials_fsunlinsoldense.so
+%attr(755,root,root) %{_libdir}/libsundials_fsunlinsolklu.so
+%attr(755,root,root) %{_libdir}/libsundials_fsunlinsolpcg.so
+%attr(755,root,root) %{_libdir}/libsundials_fsunlinsolspbcgs.so
+%attr(755,root,root) %{_libdir}/libsundials_fsunlinsolspfgmr.so
+%attr(755,root,root) %{_libdir}/libsundials_fsunlinsolspgmr.so
+%attr(755,root,root) %{_libdir}/libsundials_fsunlinsolsptfqmr.so
+%attr(755,root,root) %{_libdir}/libsundials_fsunmatrixband.so
+%attr(755,root,root) %{_libdir}/libsundials_fsunmatrixdense.so
+%attr(755,root,root) %{_libdir}/libsundials_fsunmatrixsparse.so
# Fortran - static only
%{_libdir}/libsundials_farkode.a
%{_libdir}/libsundials_fcvode.a
@@ -207,6 +273,8 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/kinsol
%{_includedir}/nvector
%{_includedir}/sundials
+%{_includedir}/sunlinsol
+%{_includedir}/sunmatrix
%{_examplesdir}/%{name}-%{version}
%files static
@@ -222,12 +290,34 @@ rm -rf $RPM_BUILD_ROOT
%endif
%{_libdir}/libsundials_nvecpthreads.a
%{_libdir}/libsundials_nvecserial.a
+%{_libdir}/libsundials_sunlinsolband.a
+%{_libdir}/libsundials_sunlinsoldense.a
+%{_libdir}/libsundials_sunlinsolklu.a
+%{_libdir}/libsundials_sunlinsolpcg.a
+%{_libdir}/libsundials_sunlinsolspbcgs.a
+%{_libdir}/libsundials_sunlinsolspfgmr.a
+%{_libdir}/libsundials_sunlinsolspgmr.a
+%{_libdir}/libsundials_sunlinsolsptfqmr.a
+%{_libdir}/libsundials_sunmatrixband.a
+%{_libdir}/libsundials_sunmatrixdense.a
+%{_libdir}/libsundials_sunmatrixsparse.a
# Fortran
%if %{with openmp}
%{_libdir}/libsundials_fnvecopenmp.a
%endif
%{_libdir}/libsundials_fnvecpthreads.a
%{_libdir}/libsundials_fnvecserial.a
+%{_libdir}/libsundials_fsunlinsolband.a
+%{_libdir}/libsundials_fsunlinsoldense.a
+%{_libdir}/libsundials_fsunlinsolklu.a
+%{_libdir}/libsundials_fsunlinsolpcg.a
+%{_libdir}/libsundials_fsunlinsolspbcgs.a
+%{_libdir}/libsundials_fsunlinsolspfgmr.a
+%{_libdir}/libsundials_fsunlinsolspgmr.a
+%{_libdir}/libsundials_fsunlinsolsptfqmr.a
+%{_libdir}/libsundials_fsunmatrixband.a
+%{_libdir}/libsundials_fsunmatrixdense.a
+%{_libdir}/libsundials_fsunmatrixsparse.a
%files apidocs
%defattr(644,root,root,755)
diff --git a/sundials-cmake.patch b/sundials-cmake.patch
index de7d7f1..853daa2 100644
--- a/sundials-cmake.patch
+++ b/sundials-cmake.patch
@@ -9,16 +9,7 @@
ENDIF(BUILD_STATIC_LIBS)
-@@ -138,6 +138,8 @@ IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_arkode_shared SHARED
- ${arkode_SOURCES} ${arkode_BL_SOURCES} ${shared_SOURCES})
-
-+ TARGET_LINK_LIBRARIES(sundials_arkode_shared klu lapack m)
-+
- # Set the library name and make sure it is not deleted
- SET_TARGET_PROPERTIES(sundials_arkode_shared
- PROPERTIES OUTPUT_NAME sundials_arkode CLEAN_DIRECT_OUTPUT 1)
-@@ -147,7 +149,7 @@ IF(BUILD_SHARED_LIBS)
+@@ -147,7 +147,7 @@ IF(BUILD_SHARED_LIBS)
PROPERTIES VERSION ${arkodelib_VERSION} SOVERSION ${arkodelib_SOVERSION})
# Install the ARKODE library
@@ -38,16 +29,7 @@
ENDIF(BUILD_STATIC_LIBS)
-@@ -129,6 +129,8 @@ IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_cvode_shared SHARED
- ${cvode_SOURCES} ${cvode_BL_SOURCES} ${shared_SOURCES})
-
-+ TARGET_LINK_LIBRARIES(sundials_cvode_shared klu lapack m)
-+
- # Set the library name and make sure it is not deleted
- SET_TARGET_PROPERTIES(sundials_cvode_shared
- PROPERTIES OUTPUT_NAME sundials_cvode CLEAN_DIRECT_OUTPUT 1)
-@@ -138,7 +140,7 @@ IF(BUILD_SHARED_LIBS)
+@@ -138,7 +138,7 @@ IF(BUILD_SHARED_LIBS)
PROPERTIES VERSION ${cvodelib_VERSION} SOVERSION ${cvodelib_SOVERSION})
# Install the CVODE library
@@ -56,9 +38,9 @@
ENDIF(BUILD_SHARED_LIBS)
---- sundials-2.6.2/src/nvec_ser/CMakeLists.txt.orig 2015-07-31 02:07:26.000000000 +0200
-+++ sundials-2.6.2/src/nvec_ser/CMakeLists.txt 2023-01-20 06:13:11.683593284 +0100
-@@ -44,7 +44,7 @@ IF(BUILD_STATIC_LIBS)
+--- sundials-3.1.1/src/nvec_ser/CMakeLists.txt.orig 2018-05-08 03:19:20.000000000 +0200
++++ sundials-3.1.1/src/nvec_ser/CMakeLists.txt 2023-01-21 21:40:58.202787181 +0100
+@@ -43,7 +43,7 @@ IF(BUILD_STATIC_LIBS)
ADD_LIBRARY(sundials_nvecserial_static STATIC ${nvecserial_SOURCES} ${shared_SOURCES})
SET_TARGET_PROPERTIES(sundials_nvecserial_static
PROPERTIES OUTPUT_NAME sundials_nvecserial CLEAN_DIRECT_OUTPUT 1)
@@ -67,12 +49,7 @@
ENDIF(BUILD_STATIC_LIBS)
# Rules for building and installing the shared library:
-@@ -54,11 +54,12 @@ ENDIF(BUILD_STATIC_LIBS)
- # - Install the NVECSERIAL library
- IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_nvecserial_shared SHARED ${nvecserial_SOURCES} ${shared_SOURCES})
-+ TARGET_LINK_LIBRARIES(sundials_nvecserial_shared m)
- SET_TARGET_PROPERTIES(sundials_nvecserial_shared
+@@ -62,7 +62,7 @@ IF(BUILD_SHARED_LIBS)
PROPERTIES OUTPUT_NAME sundials_nvecserial CLEAN_DIRECT_OUTPUT 1)
SET_TARGET_PROPERTIES(sundials_nvecserial_shared
PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
@@ -81,28 +58,27 @@
ENDIF(BUILD_SHARED_LIBS)
# Install the NVECSERIAL header files
-@@ -71,15 +72,16 @@ IF(FCMIX_ENABLE AND F77_FOUND)
+@@ -76,7 +76,7 @@ IF(FCMIX_ENABLE AND F77_FOUND)
ADD_LIBRARY(sundials_fnvecserial_static STATIC ${fnvecserial_SOURCES})
SET_TARGET_PROPERTIES(sundials_fnvecserial_static
PROPERTIES OUTPUT_NAME sundials_fnvecserial CLEAN_DIRECT_OUTPUT 1)
- INSTALL(TARGETS sundials_fnvecserial_static DESTINATION lib)
+ INSTALL(TARGETS sundials_fnvecserial_static DESTINATION lib${LIB_SUFFIX})
ENDIF(BUILD_STATIC_LIBS)
+
IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_fnvecserial_shared ${fnvecserial_SOURCES})
-+ TARGET_LINK_LIBRARIES(sundials_fnvecserial_shared sundials_nvecserial_shared)
- SET_TARGET_PROPERTIES(sundials_fnvecserial_shared
+@@ -89,7 +89,7 @@ IF(FCMIX_ENABLE AND F77_FOUND)
PROPERTIES OUTPUT_NAME sundials_fnvecserial CLEAN_DIRECT_OUTPUT 1)
SET_TARGET_PROPERTIES(sundials_fnvecserial_shared
PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
- INSTALL(TARGETS sundials_fnvecserial_shared DESTINATION lib)
+ INSTALL(TARGETS sundials_fnvecserial_shared DESTINATION lib${LIB_SUFFIX})
ENDIF(BUILD_SHARED_LIBS)
- ENDIF(FCMIX_ENABLE AND F77_FOUND)
---- sundials-2.6.2/src/nvec_openmp/CMakeLists.txt.orig 2015-07-31 02:07:26.000000000 +0200
-+++ sundials-2.6.2/src/nvec_openmp/CMakeLists.txt 2023-01-20 06:13:23.611528600 +0100
-@@ -51,7 +51,7 @@ IF(BUILD_STATIC_LIBS)
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+--- sundials-3.1.1/src/nvec_openmp/CMakeLists.txt.orig 2018-05-08 03:19:20.000000000 +0200
++++ sundials-3.1.1/src/nvec_openmp/CMakeLists.txt 2023-01-21 21:40:26.789624027 +0100
+@@ -50,7 +50,7 @@ IF(BUILD_STATIC_LIBS)
ADD_LIBRARY(sundials_nvecopenmp_static STATIC ${nvecopenmp_SOURCES} ${shared_SOURCES})
SET_TARGET_PROPERTIES(sundials_nvecopenmp_static
PROPERTIES OUTPUT_NAME sundials_nvecopenmp CLEAN_DIRECT_OUTPUT 1)
@@ -111,12 +87,7 @@
ENDIF(BUILD_STATIC_LIBS)
# Rules for building and installing the shared library:
-@@ -61,11 +61,12 @@ ENDIF(BUILD_STATIC_LIBS)
- # - Install the NVECOPENMP library
- IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_nvecopenmp_shared SHARED ${nvecopenmp_SOURCES} ${shared_SOURCES})
-+ TARGET_LINK_LIBRARIES(sundials_nvecopenmp_shared m)
- SET_TARGET_PROPERTIES(sundials_nvecopenmp_shared
+@@ -69,7 +69,7 @@ IF(BUILD_SHARED_LIBS)
PROPERTIES OUTPUT_NAME sundials_nvecopenmp CLEAN_DIRECT_OUTPUT 1)
SET_TARGET_PROPERTIES(sundials_nvecopenmp_shared
PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
@@ -125,28 +96,18 @@
ENDIF(BUILD_SHARED_LIBS)
# Install the NVECOPENMP header files
-@@ -78,15 +79,16 @@ IF(FCMIX_ENABLE AND F77_FOUND)
- ADD_LIBRARY(sundials_fnvecopenmp_static STATIC ${fnvecopenmp_SOURCES})
- SET_TARGET_PROPERTIES(sundials_fnvecopenmp_static
- PROPERTIES OUTPUT_NAME sundials_fnvecopenmp CLEAN_DIRECT_OUTPUT 1)
-- INSTALL(TARGETS sundials_fnvecopenmp_static DESTINATION lib)
-+ INSTALL(TARGETS sundials_fnvecopenmp_static DESTINATION lib${LIB_SUFFIX})
- ENDIF(BUILD_STATIC_LIBS)
- IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_fnvecopenmp_shared ${fnvecopenmp_SOURCES})
-+ TARGET_LINK_LIBRARIES(sundials_fnvecopenmp_shared sundials_nvecopenmp_shared)
- SET_TARGET_PROPERTIES(sundials_fnvecopenmp_shared
+@@ -96,7 +96,7 @@ IF(FCMIX_ENABLE AND F77_FOUND)
PROPERTIES OUTPUT_NAME sundials_fnvecopenmp CLEAN_DIRECT_OUTPUT 1)
SET_TARGET_PROPERTIES(sundials_fnvecopenmp_shared
PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
- INSTALL(TARGETS sundials_fnvecopenmp_shared DESTINATION lib)
+ INSTALL(TARGETS sundials_fnvecopenmp_shared DESTINATION lib${LIB_SUFFIX})
ENDIF(BUILD_SHARED_LIBS)
- ENDIF(FCMIX_ENABLE AND F77_FOUND)
---- sundials-2.6.2/src/nvec_pthreads/CMakeLists.txt.orig 2015-07-31 02:07:26.000000000 +0200
-+++ sundials-2.6.2/src/nvec_pthreads/CMakeLists.txt 2023-01-20 06:13:36.412659311 +0100
-@@ -44,7 +44,7 @@ IF(BUILD_STATIC_LIBS)
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+--- sundials-3.1.1/src/nvec_pthreads/CMakeLists.txt.orig 2018-05-08 03:19:20.000000000 +0200
++++ sundials-3.1.1/src/nvec_pthreads/CMakeLists.txt 2023-01-21 21:41:47.525853309 +0100
+@@ -43,7 +43,7 @@ IF(BUILD_STATIC_LIBS)
ADD_LIBRARY(sundials_nvecpthreads_static STATIC ${nvecpthreads_SOURCES} ${shared_SOURCES})
SET_TARGET_PROPERTIES(sundials_nvecpthreads_static
PROPERTIES OUTPUT_NAME sundials_nvecpthreads CLEAN_DIRECT_OUTPUT 1)
@@ -155,12 +116,7 @@
ENDIF(BUILD_STATIC_LIBS)
# Rules for building and installing the shared library:
-@@ -54,11 +54,12 @@ ENDIF(BUILD_STATIC_LIBS)
- # - Install the NVECPTHREADS library
- IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_nvecpthreads_shared SHARED ${nvecpthreads_SOURCES} ${shared_SOURCES})
-+ TARGET_LINK_LIBRARIES(sundials_nvecpthreads_shared m)
- SET_TARGET_PROPERTIES(sundials_nvecpthreads_shared
+@@ -64,7 +64,7 @@ IF(BUILD_SHARED_LIBS)
PROPERTIES OUTPUT_NAME sundials_nvecpthreads CLEAN_DIRECT_OUTPUT 1)
SET_TARGET_PROPERTIES(sundials_nvecpthreads_shared
PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
@@ -169,17 +125,16 @@
ENDIF(BUILD_SHARED_LIBS)
# Install the NVECPTHREADS header files
-@@ -71,15 +72,16 @@ IF(FCMIX_ENABLE AND F77_FOUND)
+@@ -78,7 +78,7 @@ IF(FCMIX_ENABLE AND F77_FOUND)
ADD_LIBRARY(sundials_fnvecpthreads_static STATIC ${fnvecpthreads_SOURCES})
SET_TARGET_PROPERTIES(sundials_fnvecpthreads_static
PROPERTIES OUTPUT_NAME sundials_fnvecpthreads CLEAN_DIRECT_OUTPUT 1)
- INSTALL(TARGETS sundials_fnvecpthreads_static DESTINATION lib)
+ INSTALL(TARGETS sundials_fnvecpthreads_static DESTINATION lib${LIB_SUFFIX})
ENDIF(BUILD_STATIC_LIBS)
+
IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_fnvecpthreads_shared ${fnvecpthreads_SOURCES})
-+ TARGET_LINK_LIBRARIES(sundials_fnvecpthreads_shared sundials_nvecpthreads_shared)
- SET_TARGET_PROPERTIES(sundials_fnvecpthreads_shared
+@@ -91,7 +91,7 @@ IF(FCMIX_ENABLE AND F77_FOUND)
PROPERTIES OUTPUT_NAME sundials_fnvecpthreads CLEAN_DIRECT_OUTPUT 1)
SET_TARGET_PROPERTIES(sundials_fnvecpthreads_shared
PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
@@ -199,16 +154,7 @@
ENDIF(BUILD_STATIC_LIBS)
-@@ -132,6 +132,8 @@ IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_cvodes_shared SHARED
- ${cvodes_SOURCES} ${cvodes_BL_SOURCES} ${shared_SOURCES})
-
-+ TARGET_LINK_LIBRARIES(sundials_cvodes_shared klu lapack m)
-+
- # Set the library name and make sure it is not deleted
- SET_TARGET_PROPERTIES(sundials_cvodes_shared
- PROPERTIES OUTPUT_NAME sundials_cvodes CLEAN_DIRECT_OUTPUT 1)
-@@ -141,7 +143,7 @@ IF(BUILD_SHARED_LIBS)
+@@ -141,7 +141,7 @@ IF(BUILD_SHARED_LIBS)
PROPERTIES VERSION ${cvodeslib_VERSION} SOVERSION ${cvodeslib_SOVERSION})
# Install the CVODES library
@@ -228,16 +174,7 @@
ENDIF(BUILD_STATIC_LIBS)
-@@ -125,6 +125,8 @@ IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_ida_shared SHARED
- ${ida_SOURCES} ${ida_BL_SOURCES} ${shared_SOURCES})
-
-+ TARGET_LINK_LIBRARIES(sundials_ida_shared klu lapack m)
-+
- # Set the library name and make sure it is not deleted
- SET_TARGET_PROPERTIES(sundials_ida_shared
- PROPERTIES OUTPUT_NAME sundials_ida CLEAN_DIRECT_OUTPUT 1)
-@@ -134,7 +136,7 @@ IF(BUILD_SHARED_LIBS)
+@@ -134,7 +134,7 @@ IF(BUILD_SHARED_LIBS)
PROPERTIES VERSION ${idalib_VERSION} SOVERSION ${idalib_SOVERSION})
# Install the IDA library
@@ -257,16 +194,7 @@
ENDIF(BUILD_STATIC_LIBS)
-@@ -137,6 +137,8 @@ IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_idas_shared SHARED
- ${idas_SOURCES} ${idas_BL_SOURCES} ${idas_SLU_SOURCES} ${shared_SOURCES})
-
-+ TARGET_LINK_LIBRARIES(sundials_idas_shared klu lapack m)
-+
- # Set the library name and make sure it is not deleted
- SET_TARGET_PROPERTIES(sundials_idas_shared
- PROPERTIES OUTPUT_NAME sundials_idas CLEAN_DIRECT_OUTPUT 1)
-@@ -146,7 +148,7 @@ IF(BUILD_SHARED_LIBS)
+@@ -146,7 +146,7 @@ IF(BUILD_SHARED_LIBS)
PROPERTIES VERSION ${idaslib_VERSION} SOVERSION ${idaslib_SOVERSION})
# Install the IDAS library
@@ -286,16 +214,7 @@
ENDIF(BUILD_STATIC_LIBS)
-@@ -145,6 +145,8 @@ IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_kinsol_shared SHARED
- ${kinsol_SOURCES} ${kinsol_BL_SOURCES} ${kinsol_SLU_SOURCES} ${kinsol_KLU_SOURCES} ${shared_SOURCES})
-
-+ TARGET_LINK_LIBRARIES(sundials_kinsol_shared klu lapack m)
-+
- # Set the library name and make sure it is not deleted
- SET_TARGET_PROPERTIES(sundials_kinsol_shared
- PROPERTIES OUTPUT_NAME sundials_kinsol CLEAN_DIRECT_OUTPUT 1)
-@@ -154,7 +156,7 @@ IF(BUILD_SHARED_LIBS)
+@@ -154,7 +154,7 @@ IF(BUILD_SHARED_LIBS)
PROPERTIES VERSION ${kinsollib_VERSION} SOVERSION ${kinsollib_SOVERSION})
# Install the KINSOL library
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sundials.git/commitdiff/ae7c7d3c31de2d98cda2dbda2d6a936d606f4eb9
More information about the pld-cvs-commit
mailing list