[petsc] 04/08: apply upstream configure patch fff42fd

[Drew Parsons]

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

dparsons pushed a commit to branch master
in repository petsc.

commit 26815615fb2e2cce403e02c9d2d5210439979163
Author: Drew Parsons <dparsons at debian.org>
Date:   Sun Oct 4 13:51:26 2015 +0800

    apply upstream configure patch fff42fd
    
    Upstream commit fff42fd3f119bba36fbab166f4231a1509a0590c
    
    Recommended by upstream (will appear in PETSc 3.6.2).
    
    Simplifies configure lines, assumes standard include paths instead of
    needing to specify /usr/include
    
    eg: ./configure -with-metis-include=[] --with-metis-lib=-lmetis
---
 debian/patches/configure_stdpath_upstream_fff42fd | 22 ++++++++++++++++++++++
 debian/patches/series                             |  1 +
 2 files changed, 23 insertions(+)

diff --git a/debian/patches/configure_stdpath_upstream_fff42fd b/debian/patches/configure_stdpath_upstream_fff42fd
new file mode 100644
index 0000000..8021d9c
--- /dev/null
+++ b/debian/patches/configure_stdpath_upstream_fff42fd
@@ -0,0 +1,22 @@
+Index: petsc/config/BuildSystem/config/package.py
+===================================================================
+--- petsc.orig/config/BuildSystem/config/package.py
++++ petsc/config/BuildSystem/config/package.py
+@@ -383,12 +383,13 @@ class Package(config.base.Configure):
+     if 'with-'+self.package+'-include' in self.argDB or 'with-'+self.package+'-lib' in self.argDB:
+       libs = self.argDB['with-'+self.package+'-lib']
+       inc  = []
++      d  = None
+       if self.includes:
+         inc = self.argDB['with-'+self.package+'-include']
+-      # hope that package root is one level above first include directory specified
+-        d   = os.path.dirname(inc[0])
+-      else:
+-        d   = None
++        # hope that package root is one level above first include directory specified
++        if inc:
++          d   = os.path.dirname(inc[0])
++
+       if not isinstance(inc, list): inc = inc.split(' ')
+       if not isinstance(libs, list): libs = libs.split(' ')
+       inc = [os.path.abspath(i) for i in inc]
diff --git a/debian/patches/series b/debian/patches/series
index 3f8d4b4..df1e0c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ clean-no-double-colon.patch
 hypre.patch
 nocleanup.patch
 g++-4.8.patch
+configure_stdpath_upstream_fff42fd

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