[dolfin] 01/05: Create debian patch conditional-parmetis-in-cholmod.patch
Drew Parsons
dparsons at moszumanska.debian.org
Mon Aug 28 16:39:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
dparsons pushed a commit to tag debian/2017.1.0-2
in repository dolfin.
commit 89d71a7c7ba37460b89aca7c8d558849f6c8b370
Author: Drew Parsons <dparsons at debian.org>
Date: Mon Aug 28 22:36:55 2017 +0800
Create debian patch conditional-parmetis-in-cholmod.patch
This patch links cholmod support with parmetis only if parmetis
support is enabled.
Parmetis is non-free and therefore cannot routinely be supported while
dolfin is in Debian main.
---
debian/changelog | 10 ++++++++++
debian/patches/conditional-parmetis-in-cholmod.patch | 15 +++++++++++++++
debian/patches/series | 1 +
3 files changed, 26 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 01d1e29..45f748a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+dolfin (2017.1.0-2) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Create debian patch conditional-parmetis-in-cholmod.patch to only
+ link cholmod support with parmetis if parmetis support is enabled.
+ Parmetis is non-free and therefore cannot routinely be supported
+ while dolfin is in Debian main.
+
+ -- Drew Parsons <dparsons at debian.org> Mon, 28 Aug 2017 22:31:22 +0800
+
dolfin (2017.1.0-1) experimental; urgency=medium
* New upstream release.
diff --git a/debian/patches/conditional-parmetis-in-cholmod.patch b/debian/patches/conditional-parmetis-in-cholmod.patch
new file mode 100644
index 0000000..6abc668
--- /dev/null
+++ b/debian/patches/conditional-parmetis-in-cholmod.patch
@@ -0,0 +1,15 @@
+Index: dolfin/cmake/modules/FindCHOLMOD.cmake
+===================================================================
+--- dolfin.orig/cmake/modules/FindCHOLMOD.cmake
++++ dolfin/cmake/modules/FindCHOLMOD.cmake
+@@ -42,7 +42,9 @@ set(CMAKE_LIBRARY_PATH ${LAPACK_DIR}/lib
+ find_package(AMD QUIET)
+ find_package(BLAS QUIET)
+ find_package(LAPACK QUIET)
+-find_package(ParMETIS 4.0.2 QUIET)
++if (DOLFIN_ENABLE_PARMETIS)
++ find_package(ParMETIS 4.0.2 QUIET)
++endif()
+
+ # FIXME: Should we have separate FindXX modules for CAMD, COLAMD, and CCOLAMD?
+ # FIXME: find_package(CAMD)
diff --git a/debian/patches/series b/debian/patches/series
index 3a10e6f..3984b4b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
python3-decode.patch
vtk-python2-only-cmake-usefile.patch
+conditional-parmetis-in-cholmod.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fenics/dolfin.git
More information about the debian-science-commits
mailing list