[dolfin] 01/02: Add debian/patches/FindPETScSLEPc.patch

[Drew Parsons]

This is an automated email from the git hooks/post-receive script.

dparsons pushed a commit to tag debian/2017.1.0-3
in repository dolfin.

commit f3cb1d34f5e88455f17533c6a8fdd58605717fe7
Author: Drew Parsons <dparsons at debian.org>
Date:   Tue Sep 5 00:23:30 2017 +0800

    Add debian/patches/FindPETScSLEPc.patch
    
    to test for PETSc and SLEPc at build time.
    
    FindPETSc.cmake had stopped compiling PETSc against MPI, so the
    compilation test failed and PETSc therefore became marked as
    unavailable. Likewise with FindSLEPc.cmake.
    
    Thanks Johannes Ring.
---
 debian/changelog                    |  9 +++++++++
 debian/patches/FindPETScSLEPc.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d787447..a39c46b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+dolfin (2017.1.0-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Add debian/patches/FindPETScSLEPc.patch to test for PETSc and
+    SLEPc at build time. The patch ensures tests link against -lmpi.
+    Thanks Johannes Ring.
+
+ -- Drew Parsons <dparsons at debian.org>  Tue, 05 Sep 2017 00:19:37 +0800
+
 dolfin (2017.1.0-2) experimental; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/FindPETScSLEPc.patch b/debian/patches/FindPETScSLEPc.patch
new file mode 100644
index 0000000..3de7a17
--- /dev/null
+++ b/debian/patches/FindPETScSLEPc.patch
@@ -0,0 +1,26 @@
+Index: dolfin/cmake/modules/FindPETSc.cmake
+===================================================================
+--- dolfin.orig/cmake/modules/FindPETSc.cmake
++++ dolfin/cmake/modules/FindPETSc.cmake
+@@ -138,7 +138,7 @@ int main()
+     CMAKE_FLAGS
+     "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
+     "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
+-    LINK_LIBRARIES PETSC::petsc
++    LINK_LIBRARIES PETSC::petsc;${CMAKE_REQUIRED_LIBRARIES}
+     COMPILE_OUTPUT_VARIABLE PETSC_TEST_LIB_COMPILE_OUTPUT
+     RUN_OUTPUT_VARIABLE PETSC_TEST_LIB_OUTPUT)
+ 
+Index: dolfin/cmake/modules/FindSLEPc.cmake
+===================================================================
+--- dolfin.orig/cmake/modules/FindSLEPc.cmake
++++ dolfin/cmake/modules/FindSLEPc.cmake
+@@ -135,7 +135,7 @@ int main()
+     CMAKE_FLAGS
+     "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
+     "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
+-    LINK_LIBRARIES PETSC::petsc SLEPC::slepc
++    LINK_LIBRARIES PETSC::petsc SLEPC::slepc;${CMAKE_REQUIRED_LIBRARIES}
+     COMPILE_OUTPUT_VARIABLE SLEPC_TEST_LIB_COMPILE_OUTPUT
+     RUN_OUTPUT_VARIABLE SLEPC_TEST_LIB_OUTPUT
+     )
diff --git a/debian/patches/series b/debian/patches/series
index 3984b4b..a61e443 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 python3-decode.patch
 vtk-python2-only-cmake-usefile.patch
 conditional-parmetis-in-cholmod.patch
+FindPETScSLEPc.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fenics/dolfin.git