[petsc] 01/02: refresh debian/patches
Drew Parsons
dparsons at moszumanska.debian.org
Thu Oct 19 07:31:02 UTC 2017
This is an automated email from the git hooks/post-receive script.
dparsons pushed a commit to branch experimental
in repository petsc.
commit b6c63ae5b763bb65b78dd6768ced7c8dd7c6da43
Author: Drew Parsons <dparsons at debian.org>
Date: Thu Oct 19 14:51:39 2017 +0800
refresh debian/patches
---
debian/patches/build-no-rpath.patch | 4 ++--
debian/patches/clean-no-double-colon.patch | 2 +-
debian/patches/docs.patch | 2 +-
debian/patches/lib-versions.patch | 4 ++--
debian/patches/series | 3 ---
debian/patches/soname_extension | 16 ++++++++--------
debian/patches/sprng-2.patch | 2 +-
debian/patches/test_mpi_conditional_bug816101 | 2 +-
8 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/debian/patches/build-no-rpath.patch b/debian/patches/build-no-rpath.patch
index 1c9ea87..0e3f087 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
-@@ -1367,11 +1367,7 @@ class Configure(config.base.Configure):
+@@ -1390,11 +1390,7 @@ class Configure(config.base.Configure):
return
def checkSharedLinkerPaths(self):
@@ -17,7 +17,7 @@ Index: petsc/config/BuildSystem/config/setCompilers.py
languages = ['C']
if hasattr(self, 'CXX'):
languages.append('Cxx')
-@@ -1381,23 +1377,6 @@ class Configure(config.base.Configure):
+@@ -1404,23 +1400,6 @@ class Configure(config.base.Configure):
languages.append('CUDA')
for language in languages:
flag = '-L'
diff --git a/debian/patches/clean-no-double-colon.patch b/debian/patches/clean-no-double-colon.patch
index 82eaf07..d3f07af 100644
--- a/debian/patches/clean-no-double-colon.patch
+++ b/debian/patches/clean-no-double-colon.patch
@@ -17,7 +17,7 @@ Index: petsc/makefile
===================================================================
--- petsc.orig/makefile
+++ petsc/makefile
-@@ -246,7 +246,7 @@ allclean:
+@@ -262,7 +262,7 @@ allclean:
${OMAKE} PETSC_ARCH=${PETSC_ARCH} PETSC_DIR=${PETSC_DIR} allclean-legacy; \
fi
diff --git a/debian/patches/docs.patch b/debian/patches/docs.patch
index 92a6abf..ed6f979 100644
--- a/debian/patches/docs.patch
+++ b/debian/patches/docs.patch
@@ -29,7 +29,7 @@ Index: petsc/docs/index.html
<li><a href="manualpages/help.html">Index</a> of all help topics</li>
<li><a href="manualpages/singleindex.html">Index</a> of all manual pages</li>
<li><a href="manualpages/Sys/UsingFortran.html">Strategies</a> for using PETSc with Fortran</li>
-@@ -129,6 +129,7 @@
+@@ -144,6 +144,7 @@
<li><a href="codemanagement.html">Code Management</a> - hints for efficient management of large-scale application codes</li>
<li><a href="faq.html">FAQ</a> - frequently asked questions about PETSc</li>
<li><a href="license.html">License</a> - statement of the PETSc copyright</li>
diff --git a/debian/patches/lib-versions.patch b/debian/patches/lib-versions.patch
index 0409bfb..cef4f56 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 \
-@@ -559,8 +559,8 @@ deleteshared:
+@@ -566,8 +566,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; \
-@@ -897,7 +897,8 @@ shared_none:
+@@ -888,7 +888,8 @@ shared_none:
shared_linux:
- at cd ${SHARED_LIBRARY_TMPDIR}; \
diff --git a/debian/patches/series b/debian/patches/series
index b397701..1f4b140 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
build-debug-nowarn.patch
build-no-rpath.patch
docs.patch
-example-src-dir.patch
#install-dir.patch
lib-versions.patch
sprng-2.patch
@@ -15,5 +14,3 @@ python_header
soname_extension
hurd.patch
test_mpi_conditional_bug816101
-build-ssl1.1.patch
-mpi-version-test.patch
diff --git a/debian/patches/soname_extension b/debian/patches/soname_extension
index 06f965e..ebbed0d 100644
--- a/debian/patches/soname_extension
+++ b/debian/patches/soname_extension
@@ -43,7 +43,7 @@ Index: petsc/lib/petsc/conf/variables
===================================================================
--- petsc.orig/lib/petsc/conf/variables
+++ petsc/lib/petsc/conf/variables
-@@ -60,7 +60,7 @@ OBJSCU = $(SOURCECU:.cu=.o)
+@@ -61,7 +61,7 @@ OBJSCU = $(SOURCECU:.cu=.o)
# SOURCEALL - sources and includes
# SOURCED - sources/includes [but not fortran - for doc parsing?]
#
@@ -56,7 +56,7 @@ Index: petsc/gmakefile
===================================================================
--- petsc.orig/gmakefile
+++ petsc/gmakefile
-@@ -30,14 +30,14 @@ libname_function = $(call SONAME_FUNCTIO
+@@ -29,14 +29,14 @@ libname_function = $(call SONAME_FUNCTIO
basename_all = $(basename $(basename $(basename $(basename $(1)))))
sl_linker_args = $(call SL_LINKER_FUNCTION,$(call basename_all,$@),$(libpetsc_abi_version),$(libpetsc_lib_version))
@@ -79,7 +79,7 @@ Index: petsc/gmakefile
ifeq ($(PETSC_WITH_EXTERNAL_LIB),)
libpetscall_shared := $(libpetscpkgs_shared)
-@@ -122,7 +122,7 @@ endef
+@@ -186,7 +186,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
-@@ -82,6 +82,7 @@ class Configure(config.base.Configure):
+@@ -85,6 +85,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)
-@@ -94,6 +95,10 @@ class Configure(config.base.Configure):
+@@ -97,6 +98,10 @@ class Configure(config.base.Configure):
self.externalpackagesdir = framework.require('PETSc.options.externalpackagesdir',self)
self.mpi = framework.require('config.packages.MPI',self)
@@ -111,7 +111,7 @@ Index: petsc/config/PETSc/Configure.py
for utility in os.listdir(os.path.join('config','PETSc','options')):
self.registerPythonFile(utility,'PETSc.options')
-@@ -149,6 +154,10 @@ class Configure(config.base.Configure):
+@@ -159,6 +164,10 @@ class Configure(config.base.Configure):
def DumpPkgconfig(self):
''' Create a pkg-config file '''
@@ -122,7 +122,7 @@ 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')
-@@ -370,10 +379,17 @@ prepend-path PATH %s
+@@ -382,10 +391,17 @@ prepend-path PATH %s
includes.extend(i.include)
self.addMakeMacro(i.PACKAGE.replace('-','_')+'_INCLUDE',self.headers.toStringNoDupes(i.include))
self.packagelibs = libs
@@ -140,7 +140,7 @@ Index: petsc/config/PETSc/Configure.py
self.alllibs = self.libraries.toStringNoDupes(['-L'+os.path.join(self.petscdir.dir,self.arch.arch,'lib'), self.petsclib]+libs+self.libraries.math+self.compilers.flibs+self.compilers.cxxlibs)+' '+self.compilers.LIBS
self.PETSC_EXTERNAL_LIB_BASIC = self.libraries.toStringNoDupes(libs+self.libraries.math+self.compilers.flibs+self.compilers.cxxlibs+self.compilers.LIBS.split())
if self.framework.argDB['prefix'] and self.setCompilers.CSharedLinkerFlag not in ['-L']:
-@@ -393,14 +409,17 @@ prepend-path PATH %s
+@@ -405,14 +421,17 @@ prepend-path PATH %s
self.addMakeMacro('DESTDIR',self.installdir.dir)
self.addDefine('LIB_DIR','"'+os.path.join(self.installdir.dir,'lib')+'"')
diff --git a/debian/patches/sprng-2.patch b/debian/patches/sprng-2.patch
index 8b72b77..74a32fa 100644
--- a/debian/patches/sprng-2.patch
+++ b/debian/patches/sprng-2.patch
@@ -4,7 +4,7 @@ Index: petsc/src/sys/classes/random/impls/sprng/sprng.c
===================================================================
--- petsc.orig/src/sys/classes/random/impls/sprng/sprng.c
+++ petsc/src/sys/classes/random/impls/sprng/sprng.c
-@@ -12,7 +12,7 @@ EXTERN_C_END
+@@ -10,7 +10,7 @@ EXTERN_C_END
PetscErrorCode PetscRandomSeed_Sprng(PetscRandom r)
{
PetscFunctionBegin;
diff --git a/debian/patches/test_mpi_conditional_bug816101 b/debian/patches/test_mpi_conditional_bug816101
index e5c6fd6..df50303 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
-@@ -931,7 +931,7 @@ testex19: ex19.PETSc
+@@ -1029,7 +1029,7 @@ 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