Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 74b3644

Browse files
abrodkinabrodkin
committed
python-numpy: Bump to the most recent release 1.13.1
Note previously used location for releases on SourceForge is no longer supported (latest tarball v1.11.2 available there is dated 2016-10-04) so as other distros (see, Fedora http://pkgs.fedoraproject.org/cgit/rpms/numpy.git/tree/numpy.spec?id=7013948f8ba073c69a91a545f0a0898cb62652fa#n22) we get release tarball directly from GitHub. Also note 0001-no-fenv-on-uclibc.patch was rebased on v1.13.1 and 0002-Don-t-blindly-enable-frexpl-and-ldexpl-for-uClibc.patch was removed completely as corresponding code got nuked with numpy/numpy#4852. I'm not really sure if something similar to Arnout's patch is still required so it would be good if somebody more knowledgeable checks that. Signed-off-by: Alexey Brodkin <[email protected]> Cc: Rahul Bedarkar <[email protected]> Cc: Gwenhael Goavec-Merou <[email protected]> Cc: Arnout Vandecappelle <[email protected]> Cc: Peter Korsgaard <[email protected]>
1 parent c665c7c commit 74b3644

4 files changed

Lines changed: 30 additions & 93 deletions

File tree

‎package/python-numpy/0001-no-fenv-on-uclibc.patch‎

Lines changed: 25 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
Don't use <fenv.h> on uClibc
1+
From 1d309b81a6fdac33dfb5148f618bafe6ebdff958 Mon Sep 17 00:00:00 2001
2+
From: Thomas Petazzoni <[email protected]>
3+
Date: Fri, 15 Sep 2017 12:51:36 +0300
4+
Subject: [PATCH] Don't use <fenv.h> on uClibc
25

36
The python-numpy code already has provisions to not use <fenv.h> when
47
not available. However, it uses __GLIBC__ to know whether fenv.h is
@@ -9,71 +12,38 @@ This patch fixes that by changing all defined(__GLIBC__) occurences by
912
(defined(__GLIBC__) && !defined(__UCLIBC__)).
1013

1114
Signed-off-by: Thomas Petazzoni <[email protected]>
15+
Signed-off-by: Alexey Brodkin <[email protected]>
16+
---
17+
numpy/core/include/numpy/ufuncobject.h | 2 +-
18+
numpy/core/src/npymath/ieee754.c.src | 2 +-
19+
2 files changed, 2 insertions(+), 2 deletions(-)
1220

13-
Index: b/numpy/core/include/numpy/ufuncobject.h
14-
===================================================================
21+
diff --git a/numpy/core/include/numpy/ufuncobject.h b/numpy/core/include/numpy/ufuncobject.h
22+
index d0ac1fd7d732..65e49fcd5b7a 100644
1523
--- a/numpy/core/include/numpy/ufuncobject.h
1624
+++ b/numpy/core/include/numpy/ufuncobject.h
17-
@@ -413,11 +413,11 @@
18-
(void) fpsetsticky(0); \
19-
}
20-
21-
-#elif defined(__GLIBC__) || defined(__APPLE__) || \
22-
+#elif (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \
25+
@@ -319,7 +319,7 @@ typedef struct _loop1d_info {
26+
#if defined(sun) || defined(__BSD__) || defined(__OpenBSD__) || \
27+
(defined(__FreeBSD__) && (__FreeBSD_version < 502114)) || \
28+
defined(__NetBSD__) || \
29+
- defined(__GLIBC__) || defined(__APPLE__) || \
30+
+ (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \
2331
defined(__CYGWIN__) || defined(__MINGW32__) || \
24-
(defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
25-
26-
-#if defined(__GLIBC__) || defined(__APPLE__) || \
27-
+#if (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \
28-
defined(__MINGW32__) || defined(__FreeBSD__)
29-
#include <fenv.h>
30-
#elif defined(__CYGWIN__)
31-
Index: b/numpy/core/src/npymath/ieee754.c.src
32-
===================================================================
32+
(defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) || \
33+
defined(_AIX) || \
34+
diff --git a/numpy/core/src/npymath/ieee754.c.src b/numpy/core/src/npymath/ieee754.c.src
35+
index 0370ea6c77aa..e63e409b6604 100644
3336
--- a/numpy/core/src/npymath/ieee754.c.src
3437
+++ b/numpy/core/src/npymath/ieee754.c.src
35-
@@ -586,11 +586,11 @@
38+
@@ -612,7 +612,7 @@ void npy_set_floatstatus_invalid(void)
3639
}
3740

3841

3942
-#elif defined(__GLIBC__) || defined(__APPLE__) || \
4043
+#elif (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \
4144
defined(__CYGWIN__) || defined(__MINGW32__) || \
4245
(defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
43-
44-
-# if defined(__GLIBC__) || defined(__APPLE__) || \
45-
+# if (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \
46-
defined(__MINGW32__) || defined(__FreeBSD__)
4746
# include <fenv.h>
48-
# elif defined(__CYGWIN__)
49-
Index: b/numpy/numarray/_capi.c
50-
===================================================================
51-
--- a/numpy/numarray/_capi.c
52-
+++ b/numpy/numarray/_capi.c
53-
@@ -10,7 +10,7 @@
54-
#include <sys/param.h>
55-
#endif
56-
57-
-#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
58-
+#if (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
59-
#include <fenv.h>
60-
#elif defined(__CYGWIN__)
61-
#include "numpy/fenv/fenv.h"
62-
@@ -258,7 +258,7 @@
63-
}
64-
65-
/* Likewise for Integer overflows */
66-
-#if defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
67-
+#if (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
68-
static int int_overflow_error(Float64 value) { /* For x86_64 */
69-
feraiseexcept(FE_OVERFLOW);
70-
return (int) value;
71-
@@ -3007,7 +3007,7 @@
72-
return retstatus;
73-
}
74-
75-
-#elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
76-
+#elif (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
77-
78-
static int
79-
NA_checkFPErrors(void)
47+
--
48+
2.7.5
49+

‎package/python-numpy/0002-Don-t-blindly-enable-frexpl-and-ldexpl-for-uClibc.patch‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎package/python-numpy/python-numpy.hash‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# Locally computed:
2-
sha256 2764d0819acc77e9ff81b060fe7f69530b0d85c26ac9d162639b787cb227d253 numpy-1.8.0.tar.gz
1+
# Copied from https://github.com/numpy/numpy/releases/tag/v1.13.1
2+
sha256 de020ec06f1e9ce1115a50161a38bf8d4c2525379900f9cb478cc613a1e7cd93 numpy-1.13.1.tar.gz

‎package/python-numpy/python-numpy.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
#
55
################################################################################
66

7-
PYTHON_NUMPY_VERSION = 1.8.0
7+
PYTHON_NUMPY_VERSION = 1.13.1
88
PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz
9-
PYTHON_NUMPY_SITE = http://downloads.sourceforge.net/numpy
9+
PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION)
1010
PYTHON_NUMPY_LICENSE = BSD-3-Clause
1111
PYTHON_NUMPY_LICENSE_FILES = LICENSE.txt
12-
PYTHON_NUMPY_SETUP_TYPE = distutils
12+
PYTHON_NUMPY_SETUP_TYPE = setuptools
1313

1414
ifeq ($(BR2_PACKAGE_CLAPACK),y)
1515
PYTHON_NUMPY_DEPENDENCIES += clapack

0 commit comments

Comments
 (0)