[slepc] 04/05: add patch install_destdir

[Drew Parsons]

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

dparsons pushed a commit to branch master
in repository slepc.

commit a10f7cf5a1c1ae87023e2b8716eefabe124436f4
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Oct 26 00:27:00 2015 +0800

    add patch install_destdir
    
    The prefix (install dir) defined by configure --prefix is not actually
    used by SLEPc's make install.   Instead, config/install.py simply copies
    destDir (where the files are staged for packaging) into installDir
    (where the files should go in the final installation).  PETSc has the
    prefix configuration stored in argDB but SLEPc does not use this. The
    consequence is that $SLEPC_DIR/lib/slepc/conf/slepc_variables gets the
    wrong directories injected.
    
    Patch install_destdir allows the final installation directory (which
    should be the value in --prefix) to be specified by SLEPC_INSTALLDIR,
    preceding the existing SLEPC_DESTDIR.
---
 debian/patches/install_destdir | 48 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 debian/rules                   |  4 ++++
 3 files changed, 53 insertions(+)

diff --git a/debian/patches/install_destdir b/debian/patches/install_destdir
new file mode 100644
index 0000000..acdba75
--- /dev/null
+++ b/debian/patches/install_destdir
@@ -0,0 +1,48 @@
+Index: slepc/config/install.py
+===================================================================
+--- slepc.orig/config/install.py
++++ slepc/config/install.py
+@@ -8,23 +8,23 @@ except NameError:
+ 
+ class Installer:
+   def __init__(self, args = None):
+-    if len(args)<6:
++    if len(args)<7:
+       print '********************************************************************'
+       print 'Installation script error - not enough arguments:'
+-      print './config/install.py SLEPC_DIR PETSC_DIR PETSC_ARCH DESTDIR LIB_SUFFIX RANLIB'
++      print './config/install.py SLEPC_DIR PETSC_DIR PETSC_ARCH INSTALLDIR DESTDIR LIB_SUFFIX RANLIB'
+       print '********************************************************************'
+       sys.exit(1)
+     self.rootDir     = args[0]
+     self.petscDir    = args[1]
+-    self.destDir     = os.path.abspath(args[2])
+-    self.arch        = args[3]
+-    self.arLibSuffix = args[4]
+-    self.ranlib      = ' '.join(args[5:])
++    self.installDir  = os.path.abspath(args[2])
++    self.destDir     = os.path.abspath(args[3])
++    self.arch        = args[4]
++    self.arLibSuffix = args[5]
++    self.ranlib      = ' '.join(args[6:])
+     self.copies = []
+     return
+ 
+   def setupDirectories(self):
+-    self.installDir        = self.destDir
+     self.rootIncludeDir    = os.path.join(self.rootDir, 'include')
+     self.archIncludeDir    = os.path.join(self.rootDir, self.arch, 'include')
+     self.rootConfDir       = os.path.join(self.rootDir, 'lib','slepc','conf')
+Index: slepc/makefile
+===================================================================
+--- slepc.orig/makefile
++++ slepc/makefile
+@@ -253,7 +253,7 @@ chk_slepc_dir:
+ # Install relevant files in the prefix directory
+ #
+ install:
+-	-@${PYTHON} ./config/install.py ${SLEPC_DIR} ${PETSC_DIR} ${SLEPC_DESTDIR} ${PETSC_ARCH} ${AR_LIB_SUFFIX} ${RANLIB};
++	-@${PYTHON} ./config/install.py ${SLEPC_DIR} ${PETSC_DIR} ${SLEPC_INSTALLDIR} ${SLEPC_DESTDIR} ${PETSC_ARCH} ${AR_LIB_SUFFIX} ${RANLIB};
+ 
+ # ------------------------------------------------------------------
+ #
diff --git a/debian/patches/series b/debian/patches/series
index 4b26b06..750082a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 #petsc-shlib-link.patch
 double_colon_patch
 soname_extension
+install_destdir
diff --git a/debian/rules b/debian/rules
index 7bf0d40..2f7dfb2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -153,6 +153,7 @@ override_dh_auto_install:
 	dh_auto_build -p$(SLEPC_VERSIONED_DEV_PACKAGE) -- \
             PETSC_DIR=$(PETSC_DIR_REAL)
 	dh_auto_install -p$(SLEPC_VERSIONED_DEV_PACKAGE) --destdir=$(PACKAGE_INSTALL_DIR) --  \
+          SLEPC_INSTALLDIR=$(SLEPC_DIR_PREFIX) \
           SLEPC_DESTDIR=$(PACKAGE_INSTALL_DIR) \
           PETSC_DIR=$(PETSC_DIR_REAL)
 	echo PACKAGE_INSTALL_DIR=$(PACKAGE_INSTALL_DIR)
@@ -166,6 +167,7 @@ override_dh_auto_install:
 	dh_auto_build -p$(SLEPC_DEBUG_PACKAGE) -- \
           PETSC_DIR=$(PETSC_DIR_REAL_DEBUG)
 	dh_auto_install -p$(SLEPC_DEBUG_PACKAGE) --destdir=$(PACKAGE_DEBUG_INSTALL_DIR) --  \
+          SLEPC_INSTALLDIR=$(SLEPC_DIR_DEBUG_PREFIX) \
           SLEPC_DESTDIR=$(PACKAGE_DEBUG_INSTALL_DIR)  \
           PETSC_DIR=$(PETSC_DIR_REAL_DEBUG)
 	make SLEPC_DIR=$(CURDIR)/$(PACKAGE_DEBUG_INSTALL_DIR) PETSC_DIR=$(PETSC_DIR_REAL_DEBUG) PETSC_ARCH="" LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(CURDIR)/$(PACKAGE_INSTALL_DIR)/lib test
@@ -177,6 +179,7 @@ override_dh_auto_install:
 	dh_auto_build -p$(SLEPC_COMPLEX_VERSIONED_DEV_PACKAGE)  --  \
           PETSC_DIR=$(PETSC_DIR_COMPLEX)
 	dh_auto_install -p$(SLEPC_COMPLEX_VERSIONED_DEV_PACKAGE) --destdir=$(PACKAGE_COMPLEX_INSTALL_DIR) --  \
+          SLEPC_INSTALLDIR=$(SLEPC_COMPLEX_DIR_PREFIX) \
           SLEPC_DESTDIR=$(PACKAGE_COMPLEX_INSTALL_DIR) \
           PETSC_DIR=$(PETSC_DIR_COMPLEX)
 	echo Note: standard SLEPc built-time tests only cover real number configurations, not complex numbers.
@@ -188,6 +191,7 @@ override_dh_auto_install:
 	dh_auto_build -p$(SLEPC_COMPLEX_DEBUG_PACKAGE)  --  \
           PETSC_DIR=$(PETSC_DIR_COMPLEX_DEBUG)
 	dh_auto_install -p$(SLEPC_COMPLEX_DEBUG_PACKAGE) --destdir=$(PACKAGE_COMPLEX_DEBUG_INSTALL_DIR) --  \
+          SLEPC_INSTALLDIR=$(SLEPC_COMPLEX_DEBUG_DIR_PREFIX) \
           SLEPC_DESTDIR=$(PACKAGE_COMPLEX_DEBUG_INSTALL_DIR) \
           PETSC_DIR=$(PETSC_DIR_COMPLEX_DEBUG)
 

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