[adios] 198/207: Add use of adios_config during build

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository adios.

commit c951aef2ac073677ae8810bc53fde2dfa8ee7410
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat May 9 20:16:55 2015 +0100

    Add use of adios_config during build
---
 debian/README                          |  3 +++
 debian/patches/deprecate_numpy17.patch |  6 ++++++
 debian/patches/python_wrapper.patch    | 25 +++++++++++++++++++++++++
 debian/patches/security.patch          |  5 +++++
 debian/patches/series                  |  1 +
 5 files changed, 40 insertions(+)

diff --git a/debian/README b/debian/README
new file mode 100644
index 0000000..8090b0a
--- /dev/null
+++ b/debian/README
@@ -0,0 +1,3 @@
+TODO:
+
+* DEPRECATE NUMPY 1.7 : Prepare for NumPy 2.0 where the API in current use is deprecated.
diff --git a/debian/patches/deprecate_numpy17.patch b/debian/patches/deprecate_numpy17.patch
index 6ba3d1b..a2fe689 100644
--- a/debian/patches/deprecate_numpy17.patch
+++ b/debian/patches/deprecate_numpy17.patch
@@ -1,3 +1,9 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: WORK IN PROGRESS: Move to NumPy API > 1.7
+  Currently work is needed to complete this
+Last-Updated: 2015-05-01
+Forwarded: no
+
 Index: adios-1.8.0/wrappers/numpy/setup.py
 ===================================================================
 --- adios-1.8.0.orig/wrappers/numpy/setup.py
diff --git a/debian/patches/python_wrapper.patch b/debian/patches/python_wrapper.patch
new file mode 100644
index 0000000..2b06f4a
--- /dev/null
+++ b/debian/patches/python_wrapper.patch
@@ -0,0 +1,25 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Use adios_config in place during build and install
+Last-Updated: 2015-05-11
+Forwarded: no
+
+Index: adios-1.8.0/wrappers/numpy/setup.py
+===================================================================
+--- adios-1.8.0.orig/wrappers/numpy/setup.py
++++ adios-1.8.0/wrappers/numpy/setup.py
+@@ -19,13 +19,13 @@ m1 = Extension('adios',
+                libraries = [],
+                extra_objects = [])
+ 
+-p = subprocess.Popen(["adios_config", "-c", "-s"], stdout=subprocess.PIPE)
++p = subprocess.Popen(["../../adios_config", "-c", "-s"], stdout=subprocess.PIPE)
+ pp = p.communicate()[0].decode(encoding='UTF-8').strip()
+ for path in str(pp).split(" "):
+     if path.startswith('-I'):
+         m1.include_dirs.append(path.replace('-I', '', 1))
+ 
+-p = subprocess.Popen(["adios_config", "-l", "-s"], stdout=subprocess.PIPE)
++p = subprocess.Popen(["../../adios_config", "-l", "-s"], stdout=subprocess.PIPE)
+ pp = p.communicate()[0].decode(encoding='UTF-8').strip()
+ for path in str(pp).split(" "):
+     if path.startswith('-L'):
diff --git a/debian/patches/security.patch b/debian/patches/security.patch
index 5d47f7b..7f6f60d 100644
--- a/debian/patches/security.patch
+++ b/debian/patches/security.patch
@@ -1,3 +1,8 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Silence spurious warnings when building with security flags
+Last-Updated: 2015-05-11
+Forwarded: no
+
 Index: adios-1.7.0/utils/skeldump/skeldump.c
 ===================================================================
 --- adios-1.7.0.orig/utils/skeldump/skeldump.c
diff --git a/debian/patches/series b/debian/patches/series
index 9b034ef..42631e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ mpi4py_fix.patch
 pkgconfig.patch
 numpy_paths.patch
 # deprecate_numpy17.patch
+python_wrapper.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git