[petsc] 04/04: refresh debian/patches
Drew Parsons
dparsons at moszumanska.debian.org
Fri May 13 01:35:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
dparsons pushed a commit to branch experimental
in repository petsc.
commit 9b94efd1385ed5a7e88f06e51fec320dc240966a
Author: Drew Parsons <dparsons at debian.org>
Date: Fri May 13 00:27:20 2016 +0800
refresh debian/patches
---
debian/patches/build-no-rpath.patch | 8 ++++----
debian/patches/docs.patch | 2 +-
debian/patches/example-src-dir.patch | 17 ++---------------
debian/patches/hypre.patch | 4 ++--
debian/patches/lib-versions.patch | 4 ++--
debian/patches/soname_extension | 22 +++++++++++-----------
debian/patches/test_mpi_conditional_bug816101 | 2 +-
7 files changed, 23 insertions(+), 36 deletions(-)
diff --git a/debian/patches/build-no-rpath.patch b/debian/patches/build-no-rpath.patch
index b6780e1..cfd5b78 100644
--- a/debian/patches/build-no-rpath.patch
+++ b/debian/patches/build-no-rpath.patch
@@ -4,7 +4,7 @@ Index: petsc/config/BuildSystem/config/setCompilers.py
===================================================================
--- petsc.orig/config/BuildSystem/config/setCompilers.py
+++ petsc/config/BuildSystem/config/setCompilers.py
-@@ -1322,11 +1322,7 @@ class Configure(config.base.Configure):
+@@ -1370,11 +1370,7 @@ class Configure(config.base.Configure):
return
def checkSharedLinkerPaths(self):
@@ -17,18 +17,18 @@ Index: petsc/config/BuildSystem/config/setCompilers.py
languages = ['C']
if hasattr(self, 'CXX'):
languages.append('Cxx')
-@@ -1336,23 +1332,6 @@ class Configure(config.base.Configure):
+@@ -1384,23 +1380,6 @@ class Configure(config.base.Configure):
languages.append('CUDA')
for language in languages:
flag = '-L'
- self.pushLanguage(language)
- # test '-R' before '-rpath' as sun compilers [c,fortran] don't give proper errors with wrong options.
-- if not Configure.isDarwin():
+- if not Configure.isDarwin(self.log):
- testFlags = ['-Wl,-rpath,', '-R','-rpath ' , '-Wl,-R,']
- else:
- testFlags = ['-Wl,-rpath,']
- # test '-R' before '-Wl,-rpath' for SUN compilers [as cc on linux accepts -Wl,-rpath, but f90 & CC do not.
-- if self.isSun(self.framework.getCompiler()):
+- if self.isSun(self.framework.getCompiler(), self.log):
- testFlags.insert(0,'-R')
- for testFlag in testFlags:
- self.logPrint('Trying '+language+' linker flag '+testFlag)
diff --git a/debian/patches/docs.patch b/debian/patches/docs.patch
index 71ca613..92a6abf 100644
--- a/debian/patches/docs.patch
+++ b/debian/patches/docs.patch
@@ -41,7 +41,7 @@ Index: petsc/docs/faq.html
===================================================================
--- petsc.orig/docs/faq.html
+++ petsc/docs/faq.html
-@@ -463,23 +463,22 @@
+@@ -472,23 +472,22 @@ See http://www.mcs.anl.gov/petsc/documen
<ol>
<li>
diff --git a/debian/patches/example-src-dir.patch b/debian/patches/example-src-dir.patch
index 5780a4a..ed3d0ce 100644
--- a/debian/patches/example-src-dir.patch
+++ b/debian/patches/example-src-dir.patch
@@ -22,20 +22,7 @@ Index: petsc/src/mat/examples/tutorials/ex4.c
}
-#include <../src/mat/impls/dense/mpi/mpidense.h>
-+#include </src/mat/impls/dense/mpi/mpidense.h>
- #include <petsc/private/vecimpl.h>
++#include <src/mat/impls/dense/mpi/mpidense.h>
#undef __FUNCT__
-Index: petsc/src/mat/examples/tutorials/ex5.c
-===================================================================
---- petsc.orig/src/mat/examples/tutorials/ex5.c
-+++ petsc/src/mat/examples/tutorials/ex5.c
-@@ -7,7 +7,7 @@ static char help[] = "Each process opens
- #include <petscviewer.h>
-
- #if defined(USE_FAST_MAT_SET_VALUES)
--#include <../src/mat/impls/aij/mpi/mpiaij.h>
-+#include <src/mat/impls/aij/mpi/mpiaij.h>
- #define MatSetValues MatSetValues_MPIAIJ
- #else
- #include <petscmat.h>
+ #define __FUNCT__ "LowRankUpdate"
diff --git a/debian/patches/hypre.patch b/debian/patches/hypre.patch
index beabbb9..7af89a3 100644
--- a/debian/patches/hypre.patch
+++ b/debian/patches/hypre.patch
@@ -4,8 +4,8 @@ Index: petsc/config/BuildSystem/config/packages/hypre.py
===================================================================
--- petsc.orig/config/BuildSystem/config/packages/hypre.py
+++ petsc/config/BuildSystem/config/packages/hypre.py
-@@ -7,7 +7,7 @@ class Configure(config.package.GNUPackag
- self.download = ['http://ftp.mcs.anl.gov/pub/petsc/externalpackages/hypre-2.10.0b-p4.tar.gz']
+@@ -8,7 +8,7 @@ class Configure(config.package.GNUPackag
+ self.download = ['git://https://github.com/LLNL/hypre','https://github.com/LLNL/hypre/archive/v2.11.0.tar.gz']
self.functions = ['HYPRE_IJMatrixCreate']
self.includes = ['HYPRE.h']
- self.liblist = [['libHYPRE.a']]
diff --git a/debian/patches/lib-versions.patch b/debian/patches/lib-versions.patch
index b3d2abb..fec7b5e 100644
--- a/debian/patches/lib-versions.patch
+++ b/debian/patches/lib-versions.patch
@@ -14,7 +14,7 @@ Index: petsc/lib/petsc/conf/rules
flag=""; \
if [ -f $$library ]; then \
if [ -f $$sharedlibrary ]; then \
-@@ -550,8 +550,8 @@ deleteshared:
+@@ -558,8 +558,8 @@ deleteshared:
echo ${RM} -rf ${INSTALL_LIB_DIR}/$${LIBNAME}.dylib.dSYM; \
${RM} -rf ${INSTALL_LIB_DIR}/$${LIBNAME}.dylib.dSYM; \
fi; \
@@ -25,7 +25,7 @@ Index: petsc/lib/petsc/conf/rules
done
@if [ -f ${INSTALL_LIB_DIR}/so_locations ]; then \
echo ${RM} ${INSTALL_LIB_DIR}/so_locations; \
-@@ -890,7 +890,8 @@ shared_none:
+@@ -898,7 +898,8 @@ shared_none:
shared_linux:
- at cd ${SHARED_LIBRARY_TMPDIR}; \
diff --git a/debian/patches/soname_extension b/debian/patches/soname_extension
index ae998df..b383ba8 100644
--- a/debian/patches/soname_extension
+++ b/debian/patches/soname_extension
@@ -79,7 +79,7 @@ Index: petsc/gmakefile
ifeq ($(PETSC_WITH_EXTERNAL_LIB),)
libpetscall_shared := $(libpetscpkgs_shared)
-@@ -120,7 +120,7 @@ endef
+@@ -122,7 +122,7 @@ endef
$(if $(findstring win32fe lib,$(AR)),$(ARCHIVE_RECIPE_WIN32FE_LIB),$(ARCHIVE_RECIPE_DEFAULT))
# with-single-library=0
@@ -92,7 +92,7 @@ Index: petsc/config/PETSc/Configure.py
===================================================================
--- petsc.orig/config/PETSc/Configure.py
+++ petsc/config/PETSc/Configure.py
-@@ -53,6 +53,7 @@ class Configure(config.base.Configure):
+@@ -82,6 +82,7 @@ class Configure(config.base.Configure):
self.languages = framework.require('PETSc.options.languages', self.setCompilers)
self.debugging = framework.require('PETSc.options.debugging', self.compilers)
self.indexTypes = framework.require('PETSc.options.indexTypes', self.compilers)
@@ -100,7 +100,7 @@ Index: petsc/config/PETSc/Configure.py
self.compilers = framework.require('config.compilers', self)
self.types = framework.require('config.types', self)
self.headers = framework.require('config.headers', self)
-@@ -65,6 +66,10 @@ class Configure(config.base.Configure):
+@@ -94,6 +95,10 @@ class Configure(config.base.Configure):
self.externalpackagesdir = framework.require('PETSc.options.externalpackagesdir',self)
self.mpi = framework.require('config.packages.MPI',self)
@@ -109,9 +109,9 @@ Index: petsc/config/PETSc/Configure.py
+ self.petsclibExt=self.sharedLibraries.petsclibExt
+
for utility in os.listdir(os.path.join('config','PETSc','options')):
- (utilityName, ext) = os.path.splitext(utility)
- if not utilityName.startswith('.') and not utilityName.startswith('#') and ext == '.py' and not utilityName == '__init__':
-@@ -135,6 +140,10 @@ class Configure(config.base.Configure):
+ self.registerPythonFile(utility,'PETSc.options')
+
+@@ -149,6 +154,10 @@ class Configure(config.base.Configure):
def DumpPkgconfig(self):
''' Create a pkg-config file '''
@@ -122,16 +122,16 @@ Index: petsc/config/PETSc/Configure.py
if not os.path.exists(os.path.join(self.petscdir.dir,self.arch.arch,'lib','pkgconfig')):
os.makedirs(os.path.join(self.petscdir.dir,self.arch.arch,'lib','pkgconfig'))
fd = open(os.path.join(self.petscdir.dir,self.arch.arch,'lib','pkgconfig','PETSc.pc'),'w')
-@@ -168,7 +177,7 @@ class Configure(config.base.Configure):
+@@ -182,7 +191,7 @@ class Configure(config.base.Configure):
fd.write('Cflags: '+self.allincludes+'\n')
- plibs = self.libraries.toStringNoDupes(['-L'+os.path.join(self.petscdir.dir,self.arch.arch,'lib'),' -lpetsc'])
+ plibs = self.libraries.toStringNoDupes(['-L'+os.path.join(self.petscdir.dir,self.arch.arch,'lib'),' -lpetsc'+self.petsclibExt])
if self.framework.argDB['prefix']:
- fd.write('Libs: '+plibs.replace(os.path.join(self.petscdir.dir,self.arch.arch),self.framework.argDB['prefix'])+'\n')
+ fd.write('Libs: '+plibs.replace(os.path.join(self.petscdir.dir,self.arch.arch),self.installdir.dir)+'\n')
else:
-@@ -355,11 +364,15 @@ prepend-path PATH %s
+@@ -369,11 +378,15 @@ prepend-path PATH %s
includes.extend(i.include)
self.addMakeMacro(i.PACKAGE.replace('-','_')+'_INCLUDE',self.headers.toStringNoDupes(i.include))
self.packagelibs = libs
@@ -149,7 +149,7 @@ Index: petsc/config/PETSc/Configure.py
self.PETSC_EXTERNAL_LIB_BASIC = self.libraries.toStringNoDupes(libs+self.libraries.math+self.compilers.flibs+self.compilers.cxxlibs)+' '+self.compilers.LIBS
if self.framework.argDB['prefix'] and self.setCompilers.CSharedLinkerFlag not in ['-L']:
lib_basic = self.PETSC_EXTERNAL_LIB_BASIC.replace(self.setCompilers.CSharedLinkerFlag+os.path.join(self.petscdir.dir,self.arch.arch,'lib'),self.setCompilers.CSharedLinkerFlag+os.path.join(self.installdir.dir,'lib'))
-@@ -378,14 +391,17 @@ prepend-path PATH %s
+@@ -392,14 +405,17 @@ prepend-path PATH %s
self.addMakeMacro('DESTDIR',self.installdir.dir)
self.addDefine('LIB_DIR','"'+os.path.join(self.installdir.dir,'lib')+'"')
@@ -173,7 +173,7 @@ Index: petsc/config/PETSc/Configure.py
self.addDefine('USE_SINGLE_LIBRARY', '1')
if self.sharedlibraries.useShared:
self.addMakeMacro('PETSC_SYS_LIB','${C_SH_LIB_PATH} ${PETSC_WITH_EXTERNAL_LIB}')
-@@ -460,10 +476,12 @@ prepend-path PATH %s
+@@ -474,10 +490,12 @@ prepend-path PATH %s
self.setCompilers.pushLanguage('FC')
fd.write('\"Using Fortran linker: %s\\n\"\n' % (escape(self.setCompilers.getLinker())))
self.setCompilers.popLanguage()
diff --git a/debian/patches/test_mpi_conditional_bug816101 b/debian/patches/test_mpi_conditional_bug816101
index e913ae1..0fbfb81 100644
--- a/debian/patches/test_mpi_conditional_bug816101
+++ b/debian/patches/test_mpi_conditional_bug816101
@@ -2,7 +2,7 @@ Index: petsc/src/snes/examples/tutorials/makefile
===================================================================
--- petsc.orig/src/snes/examples/tutorials/makefile
+++ petsc/src/snes/examples/tutorials/makefile
-@@ -916,7 +916,14 @@ testex19: ex19.PETSc
+@@ -926,7 +926,14 @@ testex19: ex19.PETSc
else echo "Possible error running C/C++ src/snes/examples/tutorials/ex19 with 1 MPI process"; \
echo "See http://www.mcs.anl.gov/petsc/documentation/faq.html";\
cat ex19_1.tmp; fi; \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/petsc.git
More information about the debian-science-commits
mailing list