[slepc] 09/16: refresh debian/patches
Drew Parsons
dparsons at moszumanska.debian.org
Mon Nov 6 06:33:20 UTC 2017
This is an automated email from the git hooks/post-receive script.
dparsons pushed a commit to branch experimental
in repository slepc.
commit 3dc144abbf36b387a06b80ee0e9ca805c27046cf
Author: Drew Parsons <dparsons at debian.org>
Date: Mon Nov 6 12:20:16 2017 +0800
refresh debian/patches
---
debian/patches/double_colon_patch | 6 ++---
debian/patches/install_destdir | 2 +-
debian/patches/soname_extension | 52 ++++++++++++++++++++-------------------
3 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/debian/patches/double_colon_patch b/debian/patches/double_colon_patch
index 7c04522..5ab74aa 100644
--- a/debian/patches/double_colon_patch
+++ b/debian/patches/double_colon_patch
@@ -2,12 +2,12 @@ Index: slepc/makefile
===================================================================
--- slepc.orig/makefile
+++ slepc/makefile
-@@ -225,7 +225,7 @@ allclean:
+@@ -217,7 +217,7 @@ allclean:
${OMAKE} PETSC_ARCH=${PETSC_ARCH} PETSC_DIR=${PETSC_DIR} SLEPC_DIR=${SLEPC_DIR} allclean-legacy; \
fi
-clean:: allclean
+clean: allclean
- #
- # Check if PETSC_DIR variable specified is valid
+ reconfigure:
+ @${PYTHON} ${PETSC_ARCH}/lib/slepc/conf/reconfigure-${PETSC_ARCH}.py
diff --git a/debian/patches/install_destdir b/debian/patches/install_destdir
index 0566042..3142bb1 100644
--- a/debian/patches/install_destdir
+++ b/debian/patches/install_destdir
@@ -37,7 +37,7 @@ Index: slepc/makefile
===================================================================
--- slepc.orig/makefile
+++ slepc/makefile
-@@ -253,7 +253,7 @@ chk_slepc_dir:
+@@ -248,7 +248,7 @@ chk_slepc_dir:
# Install relevant files in the prefix directory
#
install:
diff --git a/debian/patches/soname_extension b/debian/patches/soname_extension
index 05b5f31..1378f18 100644
--- a/debian/patches/soname_extension
+++ b/debian/patches/soname_extension
@@ -2,7 +2,7 @@ Index: slepc/gmakefile
===================================================================
--- slepc.orig/gmakefile
+++ slepc/gmakefile
-@@ -28,14 +28,14 @@ libname_function = $(call SONAME_FUNCTIO
+@@ -25,14 +25,14 @@ libname_function = $(call SONAME_FUNCTIO
basename_all = $(basename $(basename $(basename $(basename $(1)))))
sl_linker_args = $(call SL_LINKER_FUNCTION,$(call basename_all,$@),$(libslepc_abi_version),$(libslepc_lib_version))
@@ -25,7 +25,7 @@ Index: slepc/gmakefile
ifeq ($(PETSC_WITH_EXTERNAL_LIB),)
libslepcall_shared := $(libslepcpkgs_shared)
-@@ -120,7 +120,7 @@ endef
+@@ -117,7 +117,7 @@ endef
$(if $(findstring win32fe lib,$(AR)),$(ARCHIVE_RECIPE_WIN32FE_LIB),$(ARCHIVE_RECIPE_DEFAULT))
# with-single-library=0
@@ -38,33 +38,35 @@ Index: slepc/lib/slepc/conf/slepc_variables
===================================================================
--- slepc.orig/lib/slepc/conf/slepc_variables
+++ slepc/lib/slepc/conf/slepc_variables
-@@ -40,13 +40,13 @@ CCPPFLAGS = ${SLEPC_CCPPFLAGS}
+@@ -30,14 +30,14 @@ CCPPFLAGS = ${SLEPC_CCPPFLAGS}
FCPPFLAGS = ${SLEPC_FCPPFLAGS}
# Variables for the different SLEPc modules
-SLEPC_SYS_LIB_BASIC = -lslepcsys
-SLEPC_MFN_LIB_BASIC = -lslepcmfn ${SLEPC_SYS_LIB_BASIC}
+-SLEPC_LME_LIB_BASIC = -lslepclme ${SLEPC_SYS_LIB_BASIC}
-SLEPC_EPS_LIB_BASIC = -lslepceps ${SLEPC_SYS_LIB_BASIC}
-SLEPC_SVD_LIB_BASIC = -lslepcsvd ${SLEPC_EPS_LIB_BASIC}
-SLEPC_PEP_LIB_BASIC = -lslepcpep ${SLEPC_EPS_LIB_BASIC}
-SLEPC_NEP_LIB_BASIC = -lslepcnep ${SLEPC_PEP_LIB_BASIC}
--SLEPC_LIB_BASIC = -lslepcnep -lslepcpep -lslepcmfn ${SLEPC_SVD_LIB_BASIC}
+-SLEPC_LIB_BASIC = -lslepcnep -lslepcpep -lslepcmfn -lslepclme ${SLEPC_SVD_LIB_BASIC}
+SLEPC_SYS_LIB_BASIC = -lslepcsys$(SLEPC_LIB_EXT)
+SLEPC_MFN_LIB_BASIC = -lslepcmfn$(SLEPC_LIB_EXT) ${SLEPC_SYS_LIB_BASIC}
++SLEPC_LME_LIB_BASIC = -lslepclme$(SLEPC_LIB_EXT) ${SLEPC_SYS_LIB_BASIC}
+SLEPC_EPS_LIB_BASIC = -lslepceps$(SLEPC_LIB_EXT) ${SLEPC_SYS_LIB_BASIC}
+SLEPC_SVD_LIB_BASIC = -lslepcsvd$(SLEPC_LIB_EXT) ${SLEPC_EPS_LIB_BASIC}
+SLEPC_PEP_LIB_BASIC = -lslepcpep$(SLEPC_LIB_EXT) ${SLEPC_EPS_LIB_BASIC}
+SLEPC_NEP_LIB_BASIC = -lslepcnep$(SLEPC_LIB_EXT) ${SLEPC_PEP_LIB_BASIC}
-+SLEPC_LIB_BASIC = -lslepcnep$(SLEPC_LIB_EXT) -lslepcpep$(SLEPC_LIB_EXT) -lslepcmfn$(SLEPC_LIB_EXT) ${SLEPC_SVD_LIB_BASIC}
++SLEPC_LIB_BASIC = -lslepcnep$(SLEPC_LIB_EXT) -lslepcpep$(SLEPC_LIB_EXT) -lslepcmfn$(SLEPC_LIB_EXT) -lslepclme ${SLEPC_SVD_LIB_BASIC}
- SLEPC_SYS_LIB = ${SLEPC_C_SH_LIB_PATH} -L${SLEPC_LIB_DIR} ${SLEPC_SYS_LIB_BASIC} ${SLEPC_EXTERNAL_LIB} ${PETSC_KSP_LIB}
- SLEPC_MFN_LIB = ${SLEPC_C_SH_LIB_PATH} -L${SLEPC_LIB_DIR} ${SLEPC_MFN_LIB_BASIC} ${SLEPC_EXTERNAL_LIB} ${PETSC_KSP_LIB}
-@@ -59,7 +59,7 @@ SLEPC_LIB = ${SLEPC_C_SH_LIB_PATH}
- SLEPC_EXTERNAL_LIB = ${ARPACK_LIB} ${BLZPACK_LIB} ${TRLAN_LIB} ${PRIMME_LIB} ${BLOPEX_LIB} ${FEAST_LIB}
+ SLEPC_SYS_LIB = ${SLEPC_C_SH_LIB_PATH} -L${SLEPC_LIB_DIR} ${SLEPC_SYS_LIB_BASIC} ${SLEPC_EXTERNAL_LIB} ${PETSC_SNES_LIB}
+ SLEPC_MFN_LIB = ${SLEPC_C_SH_LIB_PATH} -L${SLEPC_LIB_DIR} ${SLEPC_MFN_LIB_BASIC} ${SLEPC_EXTERNAL_LIB} ${PETSC_SNES_LIB}
+@@ -51,7 +51,7 @@ SLEPC_LIB = ${SLEPC_C_SH_LIB_PATH}
+ SLEPC_EXTERNAL_LIB = ${ARPACK_LIB} ${BLZPACK_LIB} ${TRLAN_LIB} ${PRIMME_LIB} ${BLOPEX_LIB} ${FEAST_LIB} ${SLICOT_LIB}
# Redefine variable used to build shared libraries
--SHLIBS = libslepcsys libslepcmfn libslepceps libslepcsvd libslepcpep libslepcnep
-+SHLIBS = libslepcsys$(SLEPC_LIB_EXT) libslepcmfn$(SLEPC_LIB_EXT) libslepceps$(SLEPC_LIB_EXT) libslepcsvd$(SLEPC_LIB_EXT) libslepcpep$(SLEPC_LIB_EXT) libslepcnep$(SLEPC_LIB_EXT)
+-SHLIBS = libslepcsys libslepcmfn libslepclme libslepceps libslepcsvd libslepcpep libslepcnep
++SHLIBS = libslepcsys$(SLEPC_LIB_EXT) libslepcmfn$(SLEPC_LIB_EXT) libslepclme$(SLEPC_LIB_EXT) libslepceps$(SLEPC_LIB_EXT) libslepcsvd$(SLEPC_LIB_EXT) libslepcpep$(SLEPC_LIB_EXT) libslepcnep$(SLEPC_LIB_EXT)
# Include definitions customized by configuration
include ${SLEPC_DIR}/${PETSC_ARCH}/lib/slepc/conf/slepcvariables
@@ -72,16 +74,16 @@ Index: slepc/config/configure.py
===================================================================
--- slepc.orig/config/configure.py
+++ slepc/config/configure.py
-@@ -94,7 +94,7 @@ def WritePkgconfigFile(pkgconfig,version
- pkgconfig.write('Cflags: -I'+os.path.join(prefixdir,'include'))
- if not isinstall:
- pkgconfig.write(' -I'+os.path.join(sdir,'include'))
-- pkgconfig.write('\nLibs: -L%s -lslepc\n' % os.path.join(prefixdir,'lib'))
-+ pkgconfig.write('\nLibs: -L%s -lslepc%s\n' % (os.path.join(prefixdir,'lib'), slepc.slepcLibExt))
+@@ -90,7 +90,7 @@ def WritePkgconfigFile(pkgconfig,version
+ pkgconfig.write('\nLibs:')
+ if slflag:
+ pkgconfig.write(' %s${libdir}' % slflag)
+- pkgconfig.write(' -L${libdir} -lslepc\n')
++ pkgconfig.write(' -L${libdir} -lslepc%s\n' % (slepc.slepcLibExt) )
def WriteCMakeConfigFile(cmakeconf):
''' Write the contents of the CMake configuration file '''
-@@ -299,11 +299,12 @@ if not petsc.havepackage:
+@@ -298,11 +298,12 @@ if not petsc.havepackage:
# Single library installation
if petsc.singlelib:
@@ -90,11 +92,11 @@ Index: slepc/config/configure.py
+ slepcvars.write('SHLIBS = libslepc'+slepc.slepcLibExt+'\n')
+ slepcvars.write('LIBNAME = '+os.path.join('${INSTALL_LIB_DIR}','libslepc'+slepc.slepcLibExt+'.${AR_LIB_SUFFIX}')+'\n')
+ slepcvars.write('SLEPC_LIB_EXT = '+slepc.slepcLibExt+'\n')
- for module in ['SYS','MFN','EPS','SVD','PEP','NEP']:
-- slepcvars.write('SLEPC_'+module+'_LIB = ${CC_LINKER_SLFLAG}${SLEPC_LIB_DIR} -L${SLEPC_LIB_DIR} -lslepc ${SLEPC_EXTERNAL_LIB} ${PETSC_KSP_LIB}\n')
-- slepcvars.write('SLEPC_LIB = ${CC_LINKER_SLFLAG}${SLEPC_LIB_DIR} -L${SLEPC_LIB_DIR} -lslepc ${SLEPC_EXTERNAL_LIB} ${PETSC_KSP_LIB}\n')
-+ slepcvars.write('SLEPC_'+module+'_LIB = ${CC_LINKER_SLFLAG}${SLEPC_LIB_DIR} -L${SLEPC_LIB_DIR} -lslepc'+slepc.slepcLibExt+' ${SLEPC_EXTERNAL_LIB} ${PETSC_KSP_LIB}\n')
-+ slepcvars.write('SLEPC_LIB = ${CC_LINKER_SLFLAG}${SLEPC_LIB_DIR} -L${SLEPC_LIB_DIR} -lslepc'+slepc.slepcLibExt+' ${SLEPC_EXTERNAL_LIB} ${PETSC_KSP_LIB}\n')
+ for module in ['SYS','EPS','SVD','PEP','NEP','MFN','LME']:
+- slepcvars.write('SLEPC_'+module+'_LIB = ${CC_LINKER_SLFLAG}${SLEPC_LIB_DIR} -L${SLEPC_LIB_DIR} -lslepc ${SLEPC_EXTERNAL_LIB} ${PETSC_SNES_LIB}\n')
+- slepcvars.write('SLEPC_LIB = ${CC_LINKER_SLFLAG}${SLEPC_LIB_DIR} -L${SLEPC_LIB_DIR} -lslepc ${SLEPC_EXTERNAL_LIB} ${PETSC_SNES_LIB}\n')
++ slepcvars.write('SLEPC_'+module+'_LIB = ${CC_LINKER_SLFLAG}${SLEPC_LIB_DIR} -L${SLEPC_LIB_DIR} -lslepc'+slepc.slepcLibExt+' ${SLEPC_EXTERNAL_LIB} ${PETSC_SNES_LIB}\n')
++ slepcvars.write('SLEPC_LIB = ${CC_LINKER_SLFLAG}${SLEPC_LIB_DIR} -L${SLEPC_LIB_DIR} -lslepc'+slepc.slepcLibExt+' ${SLEPC_EXTERNAL_LIB} ${PETSC_SNES_LIB}\n')
# Check for external packages and for missing LAPACK functions
for pkg in checkpackages:
@@ -102,7 +104,7 @@ Index: slepc/config/packages/slepc.py
===================================================================
--- slepc.orig/config/packages/slepc.py
+++ slepc/config/packages/slepc.py
-@@ -29,6 +29,7 @@ class SLEPc:
+@@ -18,6 +18,7 @@ class SLEPc:
self.cmake = argdb.PopBool('with-cmake')
self.prefixdir = argdb.PopPath('prefix')[0]
self.isinstall = not self.prefixdir==''
@@ -110,7 +112,7 @@ Index: slepc/config/packages/slepc.py
self.datadir = argdb.PopPath('DATAFILESPATH')[0]
def ShowHelp(self):
-@@ -36,6 +37,7 @@ class SLEPc:
+@@ -25,6 +26,7 @@ class SLEPc:
--with-clean=<bool> : Delete prior build files including externalpackages
--with-cmake=<bool> : Enable builds with CMake (disabled by default)
--prefix=<dir> : Specify location to install SLEPc (e.g., /usr/local)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/slepc.git
More information about the debian-science-commits
mailing list