Package: src:python-numpy
Severity: important
Tags: patch sid buster
* Fix autopkg test dependencies.
* Fix build with glibc-2.26.
* Fix atlas and openblas tests for openblas and atlas multiarch
locations.
* Fix autopkg test dependencies.
* Fix build with glibc-2.26.
* Fix atlas and openblas tests for openblas and atlas multiarch
locations.
diff -pruN 1:1.12.1-3.1/debian/patches/glibc-include.diff 1:1.12.1-3.1ubuntu4/debian/patches/glibc-include.diff
--- 1:1.12.1-3.1/debian/patches/glibc-include.diff 1970-01-01 00:00:00.000000000 +0000
+++ 1:1.12.1-3.1ubuntu4/debian/patches/glibc-include.diff 2017-09-15 06:16:10.000000000 +0000
@@ -0,0 +1,13 @@
+Index: b/numpy/core/src/multiarray/numpyos.c
+===================================================================
+--- a/numpy/core/src/multiarray/numpyos.c
++++ b/numpy/core/src/multiarray/numpyos.c
+@@ -15,7 +15,7 @@
+
+ #ifdef HAVE_STRTOLD_L
+ #include <stdlib.h>
+-#include <xlocale.h>
++#include <locale.h>
+ #endif
+
+
diff -pruN 1:1.12.1-3.1/debian/tests/atlas 1:1.12.1-3.1ubuntu4/debian/tests/atlas
--- 1:1.12.1-3.1/debian/tests/atlas 2017-05-27 23:44:59.000000000 +0000
+++ 1:1.12.1-3.1ubuntu4/debian/tests/atlas 2017-09-15 05:57:43.000000000 +0000
@@ -1,7 +1,8 @@
#!/bin/sh
set -efu
-blaslib=$(update-alternatives --list libblas.so.3 | grep $(basename $0))
-update-alternatives --set libblas.so.3 $blaslib
+ma=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+blaslib=$(update-alternatives --list libblas.so.3-$ma | grep $(basename $0))
+update-alternatives --set libblas.so.3-$ma $blaslib
# one python is enough
PYS=${PYS:-"$(pyversions -d 2>/dev/null)"}
diff -pruN 1:1.12.1-3.1/debian/tests/control 1:1.12.1-3.1ubuntu4/debian/tests/control
--- 1:1.12.1-3.1/debian/tests/control 2017-05-27 23:44:59.000000000 +0000
+++ 1:1.12.1-3.1ubuntu4/debian/tests/control 2017-09-15 12:19:13.000000000 +0000
@@ -1,23 +1,24 @@
Tests: python2
-Depends: python-numpy, python-all, python-nose, python-tz
+Depends: build-essential, python-numpy, python-all, python-nose, python-tz
Tests: python3
-Depends: python3-numpy, python3-all, python3-nose, python3-tz
+Depends: build-essential, python3-numpy, python3-all, python3-nose, python3-tz
#needs root for update-alternatives
Tests: openblas
Restrictions: needs-root
-Depends: python-numpy, python-all, python-nose, python-tz, libopenblas-base
+Depends: python-numpy, python-all, python-nose, python-tz, libopenblas-base, dpkg-dev, gcc
#needs root for update-alternatives
Tests: atlas
Restrictions: needs-root
-Depends: python-numpy, python-all, python-nose, python-tz, libatlas3-base
+Depends: python-numpy, python-all, python-nose, python-tz, libatlas3-base, dpkg-dev, gcc
Tests: f2py
Depends: build-essential, gfortran, python-numpy, python-numpy-dbg, python-all, python-all-dbg, python-all-dev, python3-numpy, python3-numpy-dbg, python3-all, python3-all-dbg, python3-all-dev
Tests: distutils
+Restrictions: allow-stderr
Depends: build-essential, libfftw3-dev, python-numpy
Tests: capi
diff -pruN 1:1.12.1-3.1/debian/tests/openblas 1:1.12.1-3.1ubuntu4/debian/tests/openblas
--- 1:1.12.1-3.1/debian/tests/openblas 2017-05-27 23:44:59.000000000 +0000
+++ 1:1.12.1-3.1ubuntu4/debian/tests/openblas 2017-09-15 05:56:28.000000000 +0000
@@ -1,7 +1,8 @@
#!/bin/sh
set -efu
-blaslib=$(update-alternatives --list libblas.so.3 | grep $(basename $0))
-update-alternatives --set libblas.so.3 $blaslib
+ma=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+blaslib=$(update-alternatives --list libblas.so.3-$ma | grep $(basename $0))
+update-alternatives --set libblas.so.3-$ma $blaslib
# one python is enough
PYS=${PYS:-"$(pyversions -d 2>/dev/null)"}
