[dolfin] 01/01: Enable petsc/slepc dependencies on kfreebsd.

[Drew Parsons]

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

dparsons pushed a commit to branch master
in repository dolfin.

commit 391f6c5247a579a2319592edaeb2b6071035a45e
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Mar 20 10:57:00 2017 +0800

    Enable petsc/slepc dependencies on kfreebsd.
    
    petsc and slepc have been disabled from the dolfin dependencies on
    kfreebsd.  But python-petsc4py was not likewise disabled.  The
    mismatch means that a null PETSc version was provided for the
    python-petsc4py versioned dependency, which causes the build to fail.
    
    If PETSc is loaded (enabled as a depedency at build time), then there
    is some linking problem during configuration, such that PETSc gets
    rejected on kfreebsd.  But nevertheless dolfin builds successfully on
    kfreebsd, albeit without PETSc support
    
    One fix would be to disable python-petsc4py on kfreebsd, consistent
    with the handling of petsc.  But since petsc/slepc build successfully
    on kfreebsd, I think a better fix is to enable them in the dolfin
    dependencies on kfreebsd. This allows us to monitor the build status
    of PETSc support in dolfin from the buildd logs.
    
    This means PETSc/SLEPc support in dolfin is not activated on kfreebsd,
    but at least the FTBFS is fixed.  Fixing configuration-time linking to
    PETSc is a separate issue.
    
    Closes: #822971.
---
 debian/changelog | 9 +++++++++
 debian/control   | 4 ++--
 debian/rules     | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e0abe12..e95663a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+dolfin (2016.2.0-3) UNRELEASED; urgency=medium
+
+  * Enable petsc/slepc dependencies on kfreebsd. Note that PETSc
+    support in dolfin on kfreebsd is not in fact active due to linking
+    problems during configuration tests, but dolfin builds
+    successfully without it. Closes: #822971.
+
+ -- Drew Parsons <dparsons at debian.org>  Mon, 20 Mar 2017 10:54:23 +0800
+
 dolfin (2016.2.0-2) unstable; urgency=medium
 
   * Dolfin depends on specific 3.7.X patch releases of PETSc and SLEPc
diff --git a/debian/control b/debian/control
index ba3f662..80ddb60 100644
--- a/debian/control
+++ b/debian/control
@@ -27,8 +27,8 @@ Build-Depends:
  libvtk6-dev,
  libxml2-dev,
  mpi-default-dev,
- petsc-dev (>= 3.6.4.dfsg1-2) [!kfreebsd-amd64 !kfreebsd-i386],
- slepc-dev (>= 3.6.3.dfsg1-6) [!kfreebsd-amd64 !kfreebsd-i386],
+ petsc-dev (>= 3.6.4.dfsg1-2),
+ slepc-dev (>= 3.6.3.dfsg1-6),
  python-petsc4py, python-slepc4py,
  pkg-config,
  python-dev,
diff --git a/debian/rules b/debian/rules
index ae619a8..19af5f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -137,7 +137,7 @@ override_dh_auto_install:
 	sed -i "s/-Wdate-time//g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/pkgconfig/dolfin.pc
 
 # set petsc:Depends to something like "libpetsc3.7.5-dev, libslepc3.7.3-dev, python-petsc4py (>= 3.7), python-petsc4py (<<3.8), python-slepc4py (>= 3.7), python-slepc4py (<<3.8)"
-PETSC_DEV_DEPENDS="libpetsc$(PETSC_UPSTREAM_VERSION)-dev [!kfreebsd-amd64 !kfreebsd-i386], libslepc$(SLEPC_UPSTREAM_VERSION)-dev [!kfreebsd-amd64 !kfreebsd-i386]"
+PETSC_DEV_DEPENDS="libpetsc$(PETSC_UPSTREAM_VERSION)-dev, libslepc$(SLEPC_UPSTREAM_VERSION)-dev"
 # slepc4py version must match petsc4py (using the PETSc minor version, not the patch release)
 PETSC4PY_DEPENDS=python-petsc4py (>= $(PETSC_VERSION)), python-petsc4py (<< $(PETSC_VERSION_NEXT)), python-slepc4py (>= $(PETSC_VERSION)), python-slepc4py (<< $(PETSC_VERSION_NEXT))
 override_dh_gencontrol:

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