Patch from upstream that should fix ftbfs.

This commit is contained in:
Susi Lehtola 2018-02-17 16:47:57 +01:00
parent 1437f0bfb9
commit 48d94655ee
2 changed files with 40 additions and 1 deletions

34
1287.patch Normal file
View File

@ -0,0 +1,34 @@
From ba9cacf1473f35c231432337b3c596e82d760415 Mon Sep 17 00:00:00 2001
From: Jason Rhinelander <jason@imaginary.ca>
Date: Sat, 17 Feb 2018 11:07:37 -0400
Subject: [PATCH] Fix numpy dtypes test on big-endian architectures
This fixes the test code on big-endian architectures: the array support
(PR #832) had hard-coded the little-endian '<' but we need to use '>' on
big-endian architectures.
---
tests/test_numpy_dtypes.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/test_numpy_dtypes.py b/tests/test_numpy_dtypes.py
index ae5a7020d..566682a74 100644
--- a/tests/test_numpy_dtypes.py
+++ b/tests/test_numpy_dtypes.py
@@ -103,7 +103,7 @@ def test_dtype(simple_dtype):
partial_nested_fmt(),
"[('a', 'S3'), ('b', 'S3')]",
("{{'names':['a','b','c','d'], " +
- "'formats':[('S4', (3,)),('<i4', (2,)),('u1', (3,)),('<f4', (4, 2))], " +
+ "'formats':[('S4', (3,)),('"+e+"i4', (2,)),('u1', (3,)),('"+e+"f4', (4, 2))], " +
"'offsets':[0,12,20,24], 'itemsize':56}}").format(e=e),
"[('e1', '" + e + "i8'), ('e2', 'u1')]",
"[('x', 'i1'), ('y', '" + e + "u8')]",
@@ -215,7 +215,7 @@ def test_array_array():
arr = m.create_array_array(3)
assert str(arr.dtype) == (
"{{'names':['a','b','c','d'], " +
- "'formats':[('S4', (3,)),('<i4', (2,)),('u1', (3,)),('{e}f4', (4, 2))], " +
+ "'formats':[('S4', (3,)),('"+e+"i4', (2,)),('u1', (3,)),('{e}f4', (4, 2))], " +
"'offsets':[0,12,20,24], 'itemsize':56}}").format(e=e)
assert m.print_array_array(arr) == [
"a={{A,B,C,D},{K,L,M,N},{U,V,W,X}},b={0,1}," +

View File

@ -6,11 +6,13 @@
Name: pybind11 Name: pybind11
Version: 2.2.2 Version: 2.2.2
Release: 1%{?dist} Release: 2%{?dist}
Summary: Seamless operability between C++11 and Python Summary: Seamless operability between C++11 and Python
License: BSD License: BSD
URL: https://github.com/pybind/pybind11 URL: https://github.com/pybind/pybind11
Source0: https://github.com/pybind/pybind11/archive/v%{version}/%{name}-%{version}.tar.gz Source0: https://github.com/pybind/pybind11/archive/v%{version}/%{name}-%{version}.tar.gz
# Little-endian fix
Patch0: 1287.patch
# These are only needed for the checks # These are only needed for the checks
BuildRequires: python2-devel BuildRequires: python2-devel
@ -71,6 +73,9 @@ make -C python3 check %{?_smp_mflags}
%changelog %changelog
* Sat Feb 17 2018 Susi Lehtola <jussilehtola@fedorapeople.org> - 2.2.2-2
- Fix FTBS by patch from upstream.
* Wed Feb 14 2018 Susi Lehtola <jussilehtola@fedorapeople.org> - 2.2.2-1 * Wed Feb 14 2018 Susi Lehtola <jussilehtola@fedorapeople.org> - 2.2.2-1
- Update to 2.2.2. - Update to 2.2.2.