[petsc] 02/02: Remove deprecated 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 32c1e3995e9cbd1a3b97b302b9951a2cec0210a6
Author: Drew Parsons <dparsons at debian.org>
Date: Thu Oct 19 14:57:03 2017 +0800
Remove deprecated debian patches
- applied upstream:
build-ssl1.1.patch
mpi-version-test.patch
g++-4.8.patch
- redundant:
example-src-dir.patch
install-dir.patch
configure-kfreebsd8.patch
---
debian/changelog | 9 ++++++
debian/patches/build-ssl1.1.patch | 55 --------------------------------
debian/patches/configure-kfreebsd8.patch | 14 --------
debian/patches/example-src-dir.patch | 28 ----------------
debian/patches/g++-4.8.patch | 16 ----------
debian/patches/install-dir.patch | 28 ----------------
debian/patches/mpi-version-test.patch | 40 -----------------------
debian/patches/series | 3 --
8 files changed, 9 insertions(+), 184 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5c65504..0fe8609 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,15 @@ petsc (3.8.0+dfsg1-1exp1) UNRELEASED; urgency=medium
* Team upload.
* New upstream version.
- updated API, fortran interfaces are simplified.
+ * Remove deprecated debian patches:
+ - applied upstream:
+ build-ssl1.1.patch
+ mpi-version-test.patch
+ g++-4.8.patch
+ - redundant:
+ example-src-dir.patch
+ install-dir.patch
+ configure-kfreebsd8.patch
-- Drew Parsons <dparsons at debian.org> Thu, 19 Oct 2017 09:59:02 +0800
diff --git a/debian/patches/build-ssl1.1.patch b/debian/patches/build-ssl1.1.patch
deleted file mode 100644
index b55ec1a..0000000
--- a/debian/patches/build-ssl1.1.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From ecd1d7b800a8e5d54bd2bb04019759f2bc8b1326 Mon Sep 17 00:00:00 2001
-From: Barry Smith <bsmith at mcs.anl.gov>
-Date: Fri, 25 Nov 2016 20:14:29 -0600
-Subject: [PATCH] Update so that ssl support will compile and run with SSL 1.1
-
-Tested on Apple with brew install openssl at 1.1 and on linux with manual install of 1.1
-Please report any problems
-
-Resolves issue #145
-Reported-by: Drew Parsons
----
- config/BuildSystem/config/packages/ssl.py | 4 ++--
- src/sys/webclient/client.c | 7 ++++++-
- 2 files changed, 8 insertions(+), 3 deletions(-)
-
-Index: petsc/config/BuildSystem/config/packages/ssl.py
-===================================================================
---- petsc.orig/config/BuildSystem/config/packages/ssl.py
-+++ petsc/config/BuildSystem/config/packages/ssl.py
-@@ -4,7 +4,7 @@ import os
- class Configure(config.package.Package):
- def __init__(self, framework):
- config.package.Package.__init__(self, framework)
-- self.functions = ['SSLv23_method']
-+ self.functions = ['SSL_version']
- self.includes = ['openssl/ssl.h']
- self.liblist = [['libssl.a','libcrypto.a']]
- self.lookforbydefault = 1
-@@ -22,7 +22,7 @@ class Configure(config.package.Package):
-
- def getSearchDirectories(self):
- '''macOS no longer provides openssl include files. On macOS brew puts them in the second location listed here'''
-- return ['',os.path.join('/usr','local','opt','openssl')]
-+ return ['',os.path.join('/usr','local','opt','openssl at 1.1'),os.path.join('/usr','local','opt','openssl')]
-
- def configureLibrary(self):
- if 'with-ios' in self.argDB and self.argDB['with-ios']:
-Index: petsc/src/sys/webclient/client.c
-===================================================================
---- petsc.orig/src/sys/webclient/client.c
-+++ petsc/src/sys/webclient/client.c
-@@ -53,7 +53,12 @@ PetscErrorCode PetscSSLInitializeContext
- /* Set up a SIGPIPE handler */
- signal(SIGPIPE,sigpipe_handle);
-
-- ctx = SSL_CTX_new(SSLv23_method());
-+/* suggested at https://mta.openssl.org/pipermail/openssl-dev/2015-May/001449.html */
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+ ctx = SSL_CTX_new(TLS_client_method());
-+#else
-+ ctx = SSL_CTX_new(SSLv23_client_method());
-+#endif
- SSL_CTX_set_mode(ctx,SSL_MODE_AUTO_RETRY);
-
- #if defined(PETSC_USE_SSL_CERTIFICATE)
diff --git a/debian/patches/configure-kfreebsd8.patch b/debian/patches/configure-kfreebsd8.patch
deleted file mode 100644
index 57b2967..0000000
--- a/debian/patches/configure-kfreebsd8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Add Debian GNU/KFreeBSD version 8 support
-
-Index: petsc/conf/rules
-===================================================================
---- petsc.orig/conf/rules 2010-08-04 14:31:36.000000000 -0400
-+++ petsc/conf/rules 2010-08-04 14:32:09.000000000 -0400
-@@ -865,6 +865,7 @@
- shared_kfreebsd6: shared_kfreebsd
-
- shared_kfreebsd: shared_linux
-+shared_kfreebsd8: shared_linux
-
- shared_aix3:
- shared_aix4:
diff --git a/debian/patches/example-src-dir.patch b/debian/patches/example-src-dir.patch
deleted file mode 100644
index ed3d0ce..0000000
--- a/debian/patches/example-src-dir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Remove relative path so -I$PETSC_DIR/include finds installed headers
-
-Index: petsc/src/mat/examples/tests/ex110.c
-===================================================================
---- petsc.orig/src/mat/examples/tests/ex110.c
-+++ petsc/src/mat/examples/tests/ex110.c
-@@ -1,7 +1,7 @@
- static char help[] = "Testing MatCreateMPIAIJWithSplitArrays().\n\n";
-
- #include <petscmat.h>
--#include <../src/mat/impls/aij/mpi/mpiaij.h>
-+#include <src/mat/impls/aij/mpi/mpiaij.h>
-
- #undef __FUNCT__
- #define __FUNCT__ "main"
-Index: petsc/src/mat/examples/tutorials/ex4.c
-===================================================================
---- petsc.orig/src/mat/examples/tutorials/ex4.c
-+++ petsc/src/mat/examples/tutorials/ex4.c
-@@ -89,7 +89,7 @@ int main(int argc,char **args)
- return 0;
- }
-
--#include <../src/mat/impls/dense/mpi/mpidense.h>
-+#include <src/mat/impls/dense/mpi/mpidense.h>
-
- #undef __FUNCT__
- #define __FUNCT__ "LowRankUpdate"
diff --git a/debian/patches/g++-4.8.patch b/debian/patches/g++-4.8.patch
deleted file mode 100644
index 717225d..0000000
--- a/debian/patches/g++-4.8.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix missing declaration
-
-Index: petsc-3.4.2/src/mat/impls/aij/seq/umfpack/umfpack.c
-===================================================================
---- petsc-3.4.2.orig/include/petscsys.h
-+++ petsc-3.4.2/include/petscsys.h
-@@ -14,6 +14,9 @@
- #include <petscconf.h>
- #include <petscfix.h>
-
-+/* Fix missing memcpy declaration */
-+#include <string.h>
-+
- #if defined(PETSC_DESIRE_FEATURE_TEST_MACROS)
- /*
- Feature test macros must be included before headers defined by IEEE Std 1003.1-2001
diff --git a/debian/patches/install-dir.patch b/debian/patches/install-dir.patch
deleted file mode 100644
index 02ae108..0000000
--- a/debian/patches/install-dir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Add PETSC_INSTALL_DIR variable to differentiate local package installation
-directory $(CURDIR)/debian/tmp from installed location.
-
-Seems to be obsolete in PETSc 3.1, these two makefiles don't have PETSC_LIB_DIR
-defines.
-
---- petsc-3.0.0/src/sys/utils/makefile~ 2009-03-20 10:36:47.000000000 -0400
-+++ petsc-3.0.0/src/sys/utils/makefile 2009-03-20 10:37:49.000000000 -0400
-@@ -1,7 +1,7 @@
-
- ALL: lib
-
--CFLAGS = -DPETSC_LIB_DIR='"${INSTALL_DIR}/lib"' -DPETSC_ARCH='"${PETSC_ARCH}"' -DPETSC_DIR='"${PETSC_DIR}"'
-+CFLAGS = -DPETSC_LIB_DIR='"${PETSC_INSTALL_DIR}/lib"' -DPETSC_ARCH='"${PETSC_ARCH}"' -DPETSC_DIR='"${PETSC_DIR}"'
- FFLAGS =
- SOURCEC = arch.c fhost.c fuser.c memc.c mpiu.c psleep.c sortd.c sorti.c \
- str.c sortip.c pbarrier.c pdisplay.c ctable.c psplit.c \
---- petsc-3.0.0/src/sys/objects/makefile~ 2009-03-20 10:36:47.000000000 -0400
-+++ petsc-3.0.0/src/sys/objects/makefile 2009-03-20 10:38:05.000000000 -0400
-@@ -3,7 +3,7 @@
-
- CFLAGS =
- FFLAGS =
--CPPFLAGS = -DPETSC_LIB_DIR='"${INSTALL_DIR}/lib"'
-+CPPFLAGS = -DPETSC_LIB_DIR='"${PETSC_INSTALL_DIR}/lib"'
- SOURCEC = gcomm.c gtype.c olist.c pname.c tagm.c \
- destroy.c gcookie.c inherit.c options.c pgname.c prefix.c init.c \
- pinit.c ptype.c state.c aoptions.c mpinit.c subcomm.c zope.c
diff --git a/debian/patches/mpi-version-test.patch b/debian/patches/mpi-version-test.patch
deleted file mode 100644
index 765fb8c..0000000
--- a/debian/patches/mpi-version-test.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: petsc/include/petscsys.h
-===================================================================
---- petsc.orig/include/petscsys.h
-+++ petsc/include/petscsys.h
-@@ -142,18 +142,32 @@ void assert_never_put_petsc_headers_insi
- # if !defined(__MPIUNI_H)
- # error "PETSc was configured with --with-mpi=0 but now appears to be compiling using a different mpi.h"
- # endif
-+#elif defined(PETSC_HAVE_I_MPI_NUMVERSION)
-+# if !defined(I_MPI_NUMVERSION)
-+# error "PETSc was configured with I_MPI but now appears to be compiling using a non-I_MPI mpi.h"
-+# elif I_MPI_NUMVERSION != PETSC_HAVE_I_MPI_NUMVERSION
-+# error "PETSc was configured with one I_MPI mpi.h version but now appears to be compiling using a different I_MPI mpi.h version"
-+# endif
-+#elif defined(PETSC_HAVE_MVAPICH2_NUMVERSION)
-+# if !defined(MVAPICH2_NUMVERSION)
-+# error "PETSc was configured with MVAPICH2 but now appears to be compiling using a non-MVAPICH2 mpi.h"
-+# elif MVAPICH2_NUMVERSION != PETSC_HAVE_MVAPICH2_NUMVERSION
-+# error "PETSc was configured with one MVAPICH2 mpi.h version but now appears to be compiling using a different MVAPICH2 mpi.h version"
-+# endif
- #elif defined(PETSC_HAVE_MPICH_NUMVERSION)
--# if !defined(MPICH_NUMVERSION)
-+# if !defined(MPICH_NUMVERSION) || defined(MVAPICH2_NUMVERSION) || defined(I_MPI_NUMVERSION)
- # error "PETSc was configured with MPICH but now appears to be compiling using a non-MPICH mpi.h"
--# elif MPICH_NUMVERSION != PETSC_HAVE_MPICH_NUMVERSION
-+# elif (MPICH_NUMVERSION/100000 != PETSC_HAVE_MPICH_NUMVERSION/100000) || (MPICH_NUMVERSION%100000/1000 < PETSC_HAVE_MPICH_NUMVERSION%100000/1000)
- # error "PETSc was configured with one MPICH mpi.h version but now appears to be compiling using a different MPICH mpi.h version"
- # endif
- #elif defined(PETSC_HAVE_OMPI_MAJOR_VERSION)
- # if !defined(OMPI_MAJOR_VERSION)
- # error "PETSc was configured with OpenMPI but now appears to be compiling using a non-OpenMPI mpi.h"
--# elif (OMPI_MAJOR_VERSION != PETSC_HAVE_OMPI_MAJOR_VERSION) || (OMPI_MINOR_VERSION != PETSC_HAVE_OMPI_MINOR_VERSION) || (OMPI_RELEASE_VERSION != PETSC_HAVE_OMPI_RELEASE_VERSION)
-+# elif (OMPI_MAJOR_VERSION != PETSC_HAVE_OMPI_MAJOR_VERSION) || (OMPI_MINOR_VERSION != PETSC_HAVE_OMPI_MINOR_VERSION) || (OMPI_RELEASE_VERSION < PETSC_HAVE_OMPI_RELEASE_VERSION)
- # error "PETSc was configured with one OpenMPI mpi.h version but now appears to be compiling using a different OpenMPI mpi.h version"
- # endif
-+#elif defined(OMPI_MAJOR_VERSION) || defined(MPICH_NUMVERSION)
-+# error "PETSc was configured with undetermined MPI - but now appears to be compiling using either of OpenMPI or a MPICH variant"
- #endif
-
- /*
diff --git a/debian/patches/series b/debian/patches/series
index 1f4b140..f9b49f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,15 +1,12 @@
build-debug-nowarn.patch
build-no-rpath.patch
docs.patch
-#install-dir.patch
lib-versions.patch
sprng-2.patch
clean-no-double-colon.patch
-#configure-kfreebsd8.patch
#mumps.patch
hypre.patch
nocleanup.patch
-g++-4.8.patch
python_header
soname_extension
hurd.patch
--
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