[adios] 04/09: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Dec 19 09:29:25 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository adios.
commit c882bb858770280c1905a3f6d74329323f06e1ca
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Dec 12 10:48:59 2017 +0000
refresh patches
---
debian/patches/exclude_cmake.patch | 6 +++---
debian/patches/mpi4py_fix.patch | 10 +++++-----
debian/patches/numpy_paths.patch | 12 ++++++------
debian/patches/pkgconfig.patch | 30 +++++++++---------------------
debian/patches/python_wrapper.patch | 18 +++++++++---------
5 files changed, 32 insertions(+), 44 deletions(-)
diff --git a/debian/patches/exclude_cmake.patch b/debian/patches/exclude_cmake.patch
index 9736e9a..2701187 100644
--- a/debian/patches/exclude_cmake.patch
+++ b/debian/patches/exclude_cmake.patch
@@ -4,10 +4,10 @@ Bug-Debian: http://bugs.debian.org/784766
Forwarded: no
Last-Update: 2015-05-11
-Index: adios-1.10.1/Makefile.am
+Index: adios-1.13.0/Makefile.am
===================================================================
---- adios-1.10.1.orig/Makefile.am
-+++ adios-1.10.1/Makefile.am
+--- adios-1.13.0.orig/Makefile.am
++++ adios-1.13.0/Makefile.am
@@ -35,7 +35,7 @@ if HAVE_NSSI
scripts/start.nssi.staging.sh
endif
diff --git a/debian/patches/mpi4py_fix.patch b/debian/patches/mpi4py_fix.patch
index 9be72c2..b710767 100644
--- a/debian/patches/mpi4py_fix.patch
+++ b/debian/patches/mpi4py_fix.patch
@@ -3,10 +3,10 @@ Description: Fix for missing MPI_Message in MPI < 3
Last-Updated: 2015-10-29
Forwarded: no
-Index: adios-1.10.1/wrappers/numpy/compat.h
+Index: adios-1.13.0/wrappers/numpy/compat.h
===================================================================
--- /dev/null
-+++ adios-1.10.1/wrappers/numpy/compat.h
++++ adios-1.13.0/wrappers/numpy/compat.h
@@ -0,0 +1,9 @@
+/* Added to fix missing MPI_Message in older openmpi on Debian, etc
+ * Added mckinstry at debian.org, 2014-05-19
@@ -17,10 +17,10 @@ Index: adios-1.10.1/wrappers/numpy/compat.h
+typedef void *PyMPI_MPI_Message;
+#define MPI_Message PyMPI_MPI_Message
+#endif
-Index: adios-1.10.1/wrappers/numpy/adios_mpi.pyx
+Index: adios-1.13.0/wrappers/numpy/adios_mpi.pyx
===================================================================
---- adios-1.10.1.orig/wrappers/numpy/adios_mpi.pyx
-+++ adios-1.10.1/wrappers/numpy/adios_mpi.pyx
+--- adios-1.13.0.orig/wrappers/numpy/adios_mpi.pyx
++++ adios-1.13.0/wrappers/numpy/adios_mpi.pyx
@@ -16,6 +16,8 @@ cimport numpy as np
import mpi4py.MPI as MPI
cimport mpi4py.MPI as MPI
diff --git a/debian/patches/numpy_paths.patch b/debian/patches/numpy_paths.patch
index dc2d034..28139b1 100644
--- a/debian/patches/numpy_paths.patch
+++ b/debian/patches/numpy_paths.patch
@@ -3,10 +3,10 @@ Description: Hack to enable wrappers to work in-situ during build for testing
Last-Updated: 2015-12-30
Forwarded: not-needed
-Index: adios-1.10.1/wrappers/numpy/setup.py
+Index: adios-1.13.0/wrappers/numpy/setup.py
===================================================================
---- adios-1.10.1.orig/wrappers/numpy/setup.py
-+++ adios-1.10.1/wrappers/numpy/setup.py
+--- adios-1.13.0.orig/wrappers/numpy/setup.py
++++ adios-1.13.0/wrappers/numpy/setup.py
@@ -18,7 +18,7 @@ from subprocess import check_output
m1 = Extension('adios.adios',
sources=['adios.cpp'],
@@ -16,10 +16,10 @@ Index: adios-1.10.1/wrappers/numpy/setup.py
library_dirs = [],
libraries = [],
extra_objects = [],
-Index: adios-1.10.1/wrappers/numpy/setup_mpi.py
+Index: adios-1.13.0/wrappers/numpy/setup_mpi.py
===================================================================
---- adios-1.10.1.orig/wrappers/numpy/setup_mpi.py
-+++ adios-1.10.1/wrappers/numpy/setup_mpi.py
+--- adios-1.13.0.orig/wrappers/numpy/setup_mpi.py
++++ adios-1.13.0/wrappers/numpy/setup_mpi.py
@@ -27,7 +27,7 @@ import argparse
# sys.exit(0)
diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
index df105ee..e6c8b2f 100644
--- a/debian/patches/pkgconfig.patch
+++ b/debian/patches/pkgconfig.patch
@@ -3,10 +3,10 @@ Description: pkgconfig support for ADIOS in Debian
Last-Updated: 2014-06-15
Forwarded: no
-Index: adios-1.10.1/adios.pc.in
+Index: adios-1.13.0/adios.pc.in
===================================================================
--- /dev/null
-+++ adios-1.10.1/adios.pc.in
++++ adios-1.13.0/adios.pc.in
@@ -0,0 +1,53 @@
+# Standard defines for pkg-config
+prefix=@prefix@
@@ -61,10 +61,10 @@ Index: adios-1.10.1/adios.pc.in
+Cflags: -I${prefix}/include @ADIOSLIB_CPPFLAGS@ @ADIOSLIB_CFLAGS@
+Libs: ${ADIOS_CLIB}
+Libs.private: -ldl
-Index: adios-1.10.1/Makefile.am
+Index: adios-1.13.0/Makefile.am
===================================================================
---- adios-1.10.1.orig/Makefile.am
-+++ adios-1.10.1/Makefile.am
+--- adios-1.13.0.orig/Makefile.am
++++ adios-1.13.0/Makefile.am
@@ -15,6 +15,7 @@ EXTRA_DIST = runconf \
scripts/kill.nssi.staging.sh \
scripts/start.nssi.staging.sh \
@@ -82,23 +82,11 @@ Index: adios-1.10.1/Makefile.am
if HAVE_NSSI
bin_SCRIPTS += scripts/create.nssi.config.sh \
-Index: adios-1.10.1/Makefile.in
+Index: adios-1.13.0/configure.ac
===================================================================
---- adios-1.10.1.orig/Makefile.in
-+++ adios-1.10.1/Makefile.in
-@@ -605,7 +605,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
--.PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
-Index: adios-1.10.1/configure.ac
-===================================================================
---- adios-1.10.1.orig/configure.ac
-+++ adios-1.10.1/configure.ac
-@@ -901,6 +901,7 @@ AC_CONFIG_FILES([Makefile
+--- adios-1.13.0.orig/configure.ac
++++ adios-1.13.0/configure.ac
+@@ -1016,6 +1016,7 @@ AC_CONFIG_FILES([Makefile
adios_config.flags.makesrc
adios_config.makesrc
src/public/adios_version.h
diff --git a/debian/patches/python_wrapper.patch b/debian/patches/python_wrapper.patch
index da67a93..dcb4e0c 100644
--- a/debian/patches/python_wrapper.patch
+++ b/debian/patches/python_wrapper.patch
@@ -3,10 +3,10 @@ Description: Use adios_config in place during build and install
Last-Updated: 2016-10-21
Forwarded: not-needed
-Index: adios-1.10.1/Makefile.am
+Index: adios-1.13.0/Makefile.am
===================================================================
---- adios-1.10.1.orig/Makefile.am
-+++ adios-1.10.1/Makefile.am
+--- adios-1.13.0.orig/Makefile.am
++++ adios-1.13.0/Makefile.am
@@ -60,8 +60,6 @@ install-data-hook:
echo "GITSTAT=\"git status not available\"" >> $(abs_top_builddir)/adios_git_status; \
echo "Note: git command not found or $(PWD) is not a git repository."; \
@@ -16,10 +16,10 @@ Index: adios-1.10.1/Makefile.am
CLEANFILES = adios_config adios_config.flags adios_config.makesrc adios_config.flags.makesrc
-Index: adios-1.10.1/wrappers/numpy/setup_mpi.py
+Index: adios-1.13.0/wrappers/numpy/setup_mpi.py
===================================================================
---- adios-1.10.1.orig/wrappers/numpy/setup_mpi.py
-+++ adios-1.10.1/wrappers/numpy/setup_mpi.py
+--- adios-1.13.0.orig/wrappers/numpy/setup_mpi.py
++++ adios-1.13.0/wrappers/numpy/setup_mpi.py
@@ -27,8 +27,8 @@ import argparse
# sys.exit(0)
@@ -31,10 +31,10 @@ Index: adios-1.10.1/wrappers/numpy/setup_mpi.py
extra_compile_args = []
extra_link_args = []
-Index: adios-1.10.1/wrappers/numpy/setup.py
+Index: adios-1.13.0/wrappers/numpy/setup.py
===================================================================
---- adios-1.10.1.orig/wrappers/numpy/setup.py
-+++ adios-1.10.1/wrappers/numpy/setup.py
+--- adios-1.13.0.orig/wrappers/numpy/setup.py
++++ adios-1.13.0/wrappers/numpy/setup.py
@@ -19,7 +19,7 @@ m1 = Extension('adios.adios',
sources=['adios.cpp'],
define_macros=[('_NOMPI', None)],
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git
More information about the debian-science-commits
mailing list