[Python-modules-commits] [python-numpy] 02/04: merge patched into master

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository python-numpy.

commit 11e8716a37c4a7ae2c40afd20fb017633112f519
Merge: 12d41dc 937a5d3
Author: Sandro Tosi <morph at debian.org>
Date:   Mon Jan 11 23:51:40 2016 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...erts-on-ppc-with-broken-malloc-only-longd.patch | 29 ++++++++++++++++++++++
 debian/patches/ppc_noassert.patch                  | 19 --------------
 debian/patches/series                              |  2 +-
 .../src/multiarray/lowlevel_strided_loops.c.src    |  7 ++++++
 5 files changed, 39 insertions(+), 22 deletions(-)

diff --cc debian/.git-dpm
index 682c0d0,0000000..14e8ee9
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 604149bd207b0978553d0a6ce3184c47c622f612
- 604149bd207b0978553d0a6ce3184c47c622f612
++937a5d3ded2f608ce116eb02eccdfa3717cd746d
++937a5d3ded2f608ce116eb02eccdfa3717cd746d
 +7419a239c7ec34d1da12e78cf78d4bff629d3c5e
 +7419a239c7ec34d1da12e78cf78d4bff629d3c5e
 +python-numpy_1.10.4.orig.tar.gz
 +2f543ef370d0e801b669feded49ac6baeec8c126
 +4070069
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0006-disable-asserts-on-ppc-with-broken-malloc-only-longd.patch
index 0000000,0000000..f25d924
new file mode 100644
--- /dev/null
+++ b/debian/patches/0006-disable-asserts-on-ppc-with-broken-malloc-only-longd.patch
@@@ -1,0 -1,0 +1,29 @@@
++From 937a5d3ded2f608ce116eb02eccdfa3717cd746d Mon Sep 17 00:00:00 2001
++From: Sandro Tosi <morph at debian.org>
++Date: Mon, 11 Jan 2016 23:51:23 +0000
++Subject: disable asserts on ppc with broken malloc only longdouble affected
++ will still work with softfaults
++
++Author: Julian Taylor <jtaylor.debian at googlemail.com>
++---
++ numpy/core/src/multiarray/lowlevel_strided_loops.c.src | 7 +++++++
++ 1 file changed, 7 insertions(+)
++
++diff --git a/numpy/core/src/multiarray/lowlevel_strided_loops.c.src b/numpy/core/src/multiarray/lowlevel_strided_loops.c.src
++index 0fe63c1..34e7a74 100644
++--- a/numpy/core/src/multiarray/lowlevel_strided_loops.c.src
+++++ b/numpy/core/src/multiarray/lowlevel_strided_loops.c.src
++@@ -7,6 +7,13 @@
++  *
++  * See LICENSE.txt for the license.
++  */
+++#if defined(__powerpc__) & !defined(__powerpc64__)
+++#ifndef NDEBUG
+++// disable asserts malloc broken
+++// https://sourceware.org/bugzilla/show_bug.cgi?id=6527
+++#define NDEBUG
+++#endif
+++#endif
++ 
++ #define PY_SSIZE_T_CLEAN
++ #include "Python.h"
diff --cc debian/patches/series
index 69a9e86,0000000..3e2b507
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,6 @@@
 +03_force_f2py_version.patch
 +10_use_local_python.org_object.inv_sphinx.diff
 +python3-soabi.patch
 +adapt_swig_docs_to_debian.patch
 +0005-Dont-fail-if-we-cant-import-mingw32.patch
- ppc_noassert.patch
++0006-disable-asserts-on-ppc-with-broken-malloc-only-longd.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-numpy.git