[sundials] 02/02: patches
Dima Kogan
dima at secretsauce.net
Tue May 16 22:33:41 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkogan pushed a commit to branch master
in repository sundials.
commit e32b2b57a42e1e1729dc56758d3d42e595270716
Author: Dima Kogan <dima at secretsauce.net>
Date: Tue May 16 15:25:35 2017 -0700
patches
---
...0007-arkode-library-now-links-with-libklu.patch | 24 -----
.../0007-libraries-now-link-with-libklu.patch | 104 +++++++++++++++++++++
debian/patches/series | 2 +-
3 files changed, 105 insertions(+), 25 deletions(-)
diff --git a/debian/patches/0007-arkode-library-now-links-with-libklu.patch b/debian/patches/0007-arkode-library-now-links-with-libklu.patch
deleted file mode 100644
index 1fab6aa..0000000
--- a/debian/patches/0007-arkode-library-now-links-with-libklu.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Dima Kogan <dima at secretsauce.net>
-Date: Sun, 2 Apr 2017 19:30:55 -0700
-Subject: arkode library now links with libklu
-
-arkode uses liblku symbols, so it should link against it
----
- src/arkode/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/arkode/CMakeLists.txt b/src/arkode/CMakeLists.txt
-index 4bc9e54..a92f4f8 100644
---- a/src/arkode/CMakeLists.txt
-+++ b/src/arkode/CMakeLists.txt
-@@ -138,6 +138,10 @@ IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_arkode_shared SHARED
- ${arkode_SOURCES} ${arkode_BL_SOURCES} ${shared_SOURCES})
-
-+ IF(KLU_FOUND)
-+ TARGET_LINK_LIBRARIES(sundials_arkode_shared -lklu)
-+ ENDIF(KLU_FOUND)
-+
- # 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)
diff --git a/debian/patches/0007-libraries-now-link-with-libklu.patch b/debian/patches/0007-libraries-now-link-with-libklu.patch
new file mode 100644
index 0000000..e974370
--- /dev/null
+++ b/debian/patches/0007-libraries-now-link-with-libklu.patch
@@ -0,0 +1,104 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Sun, 2 Apr 2017 19:30:55 -0700
+Subject: libraries now link with libklu
+
+Many of the DSOs we make use liblku symbols, so tey should link against it
+---
+ src/arkode/CMakeLists.txt | 4 ++++
+ src/cvode/CMakeLists.txt | 4 ++++
+ src/cvodes/CMakeLists.txt | 4 ++++
+ src/ida/CMakeLists.txt | 4 ++++
+ src/idas/CMakeLists.txt | 4 ++++
+ src/kinsol/CMakeLists.txt | 4 ++++
+ 6 files changed, 24 insertions(+)
+
+diff --git a/src/arkode/CMakeLists.txt b/src/arkode/CMakeLists.txt
+index 4bc9e54..a92f4f8 100644
+--- a/src/arkode/CMakeLists.txt
++++ b/src/arkode/CMakeLists.txt
+@@ -138,6 +138,10 @@ IF(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(sundials_arkode_shared SHARED
+ ${arkode_SOURCES} ${arkode_BL_SOURCES} ${shared_SOURCES})
+
++ IF(KLU_FOUND)
++ TARGET_LINK_LIBRARIES(sundials_arkode_shared -lklu)
++ ENDIF(KLU_FOUND)
++
+ # 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)
+diff --git a/src/cvode/CMakeLists.txt b/src/cvode/CMakeLists.txt
+index 0ef4d98..c6238c9 100644
+--- a/src/cvode/CMakeLists.txt
++++ b/src/cvode/CMakeLists.txt
+@@ -145,6 +145,10 @@ IF(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(sundials_cvode_shared SHARED
+ ${cvode_SOURCES} ${cvode_BL_SOURCES} ${shared_SOURCES})
+
++ IF(KLU_FOUND)
++ TARGET_LINK_LIBRARIES(sundials_cvode_shared -lklu)
++ ENDIF(KLU_FOUND)
++
+ # 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)
+diff --git a/src/cvodes/CMakeLists.txt b/src/cvodes/CMakeLists.txt
+index 7cc3740..ce734af 100644
+--- a/src/cvodes/CMakeLists.txt
++++ b/src/cvodes/CMakeLists.txt
+@@ -132,6 +132,10 @@ IF(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(sundials_cvodes_shared SHARED
+ ${cvodes_SOURCES} ${cvodes_BL_SOURCES} ${shared_SOURCES})
+
++ IF(KLU_FOUND)
++ TARGET_LINK_LIBRARIES(sundials_cvodes_shared -lklu)
++ ENDIF(KLU_FOUND)
++
+ # 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)
+diff --git a/src/ida/CMakeLists.txt b/src/ida/CMakeLists.txt
+index 63451cf..6b4aaa0 100644
+--- a/src/ida/CMakeLists.txt
++++ b/src/ida/CMakeLists.txt
+@@ -135,6 +135,10 @@ IF(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(sundials_ida_shared SHARED
+ ${ida_SOURCES} ${ida_BL_SOURCES} ${shared_SOURCES})
+
++ IF(KLU_FOUND)
++ TARGET_LINK_LIBRARIES(sundials_ida_shared -lklu)
++ ENDIF(KLU_FOUND)
++
+ # 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)
+diff --git a/src/idas/CMakeLists.txt b/src/idas/CMakeLists.txt
+index 113b188..231eb9f 100644
+--- a/src/idas/CMakeLists.txt
++++ b/src/idas/CMakeLists.txt
+@@ -137,6 +137,10 @@ IF(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(sundials_idas_shared SHARED
+ ${idas_SOURCES} ${idas_BL_SOURCES} ${idas_SLU_SOURCES} ${shared_SOURCES})
+
++ IF(KLU_FOUND)
++ TARGET_LINK_LIBRARIES(sundials_idas_shared -lklu)
++ ENDIF(KLU_FOUND)
++
+ # 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)
+diff --git a/src/kinsol/CMakeLists.txt b/src/kinsol/CMakeLists.txt
+index e28ad0e..17fe2e4 100644
+--- a/src/kinsol/CMakeLists.txt
++++ b/src/kinsol/CMakeLists.txt
+@@ -145,6 +145,10 @@ IF(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(sundials_kinsol_shared SHARED
+ ${kinsol_SOURCES} ${kinsol_BL_SOURCES} ${kinsol_SLU_SOURCES} ${kinsol_KLU_SOURCES} ${shared_SOURCES})
+
++ IF(KLU_FOUND)
++ TARGET_LINK_LIBRARIES(sundials_kinsol_shared -lklu)
++ ENDIF(KLU_FOUND)
++
+ # 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)
diff --git a/debian/patches/series b/debian/patches/series
index b44a949..cb0d549 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,5 @@
0004-arkode-examples-use-default-sundials-libraries.patch
0005-arkode-examples-don-t-call-SUNDIALS_ADD_TEST.patch
0006-example-added-forgotten-library-linkage.patch
-0007-arkode-library-now-links-with-libklu.patch
+0007-libraries-now-link-with-libklu.patch
0008-patched-findPETSc.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sundials.git
More information about the debian-science-commits
mailing list