rpms/numpy
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix broken build on s390x.

Browse Source
This commit is contained in:
Elliott Sales de Andrade 2018-08-11 03:04:12 -04:00
parent df43cf76cb
commit 4a1da2f72d
2 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0001-BUG-Fix-undefined-functions-on-big-endian-systems.patch Normal file
View File

@ -0,0 +1,40 @@
From ec843c7008b3d89e6f6023b88ac0f1d02e39be17 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sat, 11 Aug 2018 02:45:01 -0400
Subject: [PATCH] BUG: Fix undefined functions on big-endian systems.
Both these functions are used by `Dragon4_PrintFloat_IEEE_binary128`,
which was recently made available on big-endian systems without these
in #11568.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
numpy/core/src/multiarray/dragon4.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/numpy/core/src/multiarray/dragon4.c b/numpy/core/src/multiarray/dragon4.c
index abbf05220..2e599136e 100644
--- a/numpy/core/src/multiarray/dragon4.c
+++ b/numpy/core/src/multiarray/dragon4.c
@@ -114,7 +114,7 @@ LogBase2_64(npy_uint64 val)
return LogBase2_32((npy_uint32)val);
}
-#if defined(HAVE_LDOUBLE_IEEE_QUAD_LE)
+#if defined(HAVE_LDOUBLE_IEEE_QUAD_LE) || defined(HAVE_LDOUBLE_IEEE_QUAD_BE)
static npy_uint32
LogBase2_128(npy_uint64 hi, npy_uint64 lo)
{
@@ -217,7 +217,8 @@ BigInt_Set_uint64(BigInt *i, npy_uint64 val)
#if (defined(HAVE_LDOUBLE_IBM_DOUBLE_DOUBLE_LE) || \
defined(HAVE_LDOUBLE_IBM_DOUBLE_DOUBLE_BE) || \
- defined(HAVE_LDOUBLE_IEEE_QUAD_LE))
+ defined(HAVE_LDOUBLE_IEEE_QUAD_LE) || \
+ defined(HAVE_LDOUBLE_IEEE_QUAD_BE))
static void
BigInt_Set_2x_uint64(BigInt *i, npy_uint64 hi, npy_uint64 lo)
{
--
2.17.1

10
numpy.spec
View File

@ -11,7 +11,7 @@
Name: numpy
Version: 1.15.0
Release: 1%{?dist}
Release: 2%{?dist}
Epoch: 1
Summary: A fast multidimensional array facility for Python
@ -20,6 +20,8 @@ License: BSD and Python
URL: http://www.numpy.org/
Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
Source1: https://docs.scipy.org/doc/numpy/numpy-html-1.14.5.zip
# https://github.com/numpy/numpy/pull/11711
Patch0001: 0001-BUG-Fix-undefined-functions-on-big-endian-systems.patch
BuildRequires: python2-devel lapack-devel python2-setuptools gcc-gfortran python2-nose
BuildRequires: Cython python2-pytest
@ -131,8 +133,7 @@ This package provides the complete documentation for NumPy.
%endif # with_python3
%prep
%setup -q -n %{name}-%{version}%{?relc}
#%setup -q -n numpy-cc2b04
%autosetup -n %{name}-%{version}%{?relc} -p1
# workaround for rhbz#849713
# http://mail.scipy.org/pipermail/numpy-discussion/2012-July/063530.html
@ -326,6 +327,9 @@ popd &> /dev/null
%changelog
* Sat Aug 11 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1:1.15.0-2
- Fix broken build on s390x
* Tue Jul 24 2018 Gwyn Ciesla <limburgher@gmail.com> - 1:1.15.0-1
- 1.15.0