Bump buildroot to 2019.02
This commit is contained in:
@@ -1,68 +0,0 @@
|
||||
From 9a225e7d4fb1de5c99c6b5b17cae2fc4c2d1c59a Mon Sep 17 00:00:00 2001
|
||||
From: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
Date: Fri, 15 Sep 2017 11:59:14 +0300
|
||||
Subject: [PATCH] Add support of ARC
|
||||
|
||||
Synopsys DesignWare ARC Processors are a family of 32-bit CPUs
|
||||
which in some configurations may run Linux kernel and full stack
|
||||
of applications on top of it. Among other things is Python.
|
||||
|
||||
With that change we allow building and usage of Numpy on ARC.
|
||||
|
||||
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
---
|
||||
numpy/core/include/numpy/npy_cpu.h | 6 ++++++
|
||||
numpy/core/include/numpy/npy_endian.h | 6 ++++--
|
||||
2 files changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h
|
||||
index 60abae4e0b0e..84653ea183ce 100644
|
||||
--- a/numpy/core/include/numpy/npy_cpu.h
|
||||
+++ b/numpy/core/include/numpy/npy_cpu.h
|
||||
@@ -15,6 +15,8 @@
|
||||
* NPY_CPU_ARMEB
|
||||
* NPY_CPU_SH_LE
|
||||
* NPY_CPU_SH_BE
|
||||
+ * NPY_CPU_ARCEL
|
||||
+ * NPY_CPU_ARCEB
|
||||
*/
|
||||
#ifndef _NPY_CPUARCH_H_
|
||||
#define _NPY_CPUARCH_H_
|
||||
@@ -76,6 +78,10 @@
|
||||
#define NPY_CPU_AARCH64
|
||||
#elif defined(__mc68000__)
|
||||
#define NPY_CPU_M68K
|
||||
+#elif defined(__arc__) && defined(__LITTLE_ENDIAN__)
|
||||
+ #define NPY_CPU_ARCEL
|
||||
+#elif defined(__arc__) && defined(__BIG_ENDIAN__)
|
||||
+ #define NPY_CPU_ARCEB
|
||||
#else
|
||||
#error Unknown CPU, please report this to numpy maintainers with \
|
||||
information about your platform (OS, CPU and compiler)
|
||||
diff --git a/numpy/core/include/numpy/npy_endian.h b/numpy/core/include/numpy/npy_endian.h
|
||||
index e34b1d97e655..1a42121db92e 100644
|
||||
--- a/numpy/core/include/numpy/npy_endian.h
|
||||
+++ b/numpy/core/include/numpy/npy_endian.h
|
||||
@@ -45,7 +45,8 @@
|
||||
|| defined(NPY_CPU_AARCH64) \
|
||||
|| defined(NPY_CPU_SH_LE) \
|
||||
|| defined(NPY_CPU_MIPSEL) \
|
||||
- || defined(NPY_CPU_PPC64LE)
|
||||
+ || defined(NPY_CPU_PPC64LE) \
|
||||
+ || defined(NPY_CPU_ARCEL)
|
||||
#define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN
|
||||
#elif defined(NPY_CPU_PPC) \
|
||||
|| defined(NPY_CPU_SPARC) \
|
||||
@@ -56,7 +57,8 @@
|
||||
|| defined(NPY_CPU_SH_BE) \
|
||||
|| defined(NPY_CPU_MIPSEB) \
|
||||
|| defined(NPY_CPU_OR1K) \
|
||||
- || defined(NPY_CPU_M68K)
|
||||
+ || defined(NPY_CPU_M68K) \
|
||||
+ || defined(NPY_CPU_ARCEB)
|
||||
#define NPY_BYTE_ORDER NPY_BIG_ENDIAN
|
||||
#else
|
||||
#error Unknown CPU: can not set endianness
|
||||
--
|
||||
2.7.5
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
From ae217b0e77a52f08f46ef66fa88820946984507a Mon Sep 17 00:00:00 2001
|
||||
From: Evgeniy Didin <Evgeniy.Didin@synopsys.com>
|
||||
Date: Tue, 6 Feb 2018 15:59:22 +0300
|
||||
Subject: [PATCH] FIX: no FPU exceptions bits on ARC glibc
|
||||
|
||||
The FPU exceptions bits are missing in fenv.h in glibc for ARC architecture.
|
||||
|
||||
Signed-off-by: Evgeniy Didin <Evgeniy.Didin@synopsys.com>
|
||||
---
|
||||
numpy/core/include/numpy/ufuncobject.h | 2 +-
|
||||
numpy/core/src/npymath/ieee754.c.src | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/numpy/core/include/numpy/ufuncobject.h b/numpy/core/include/numpy/ufuncobject.h
|
||||
index 89f72fcea..29e05b179 100644
|
||||
--- a/numpy/core/include/numpy/ufuncobject.h
|
||||
+++ b/numpy/core/include/numpy/ufuncobject.h
|
||||
@@ -319,7 +319,7 @@ typedef struct _loop1d_info {
|
||||
#if defined(sun) || defined(__BSD__) || defined(__OpenBSD__) || \
|
||||
(defined(__FreeBSD__) && (__FreeBSD_version < 502114)) || \
|
||||
defined(__NetBSD__) || \
|
||||
- (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \
|
||||
+ (defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(__arc__)) || defined(__APPLE__) || \
|
||||
defined(__CYGWIN__) || defined(__MINGW32__) || \
|
||||
(defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) || \
|
||||
defined(_AIX) || \
|
||||
diff --git a/numpy/core/src/npymath/ieee754.c.src b/numpy/core/src/npymath/ieee754.c.src
|
||||
index 8dc4d77ef..78e646470 100644
|
||||
--- a/numpy/core/src/npymath/ieee754.c.src
|
||||
+++ b/numpy/core/src/npymath/ieee754.c.src
|
||||
@@ -627,7 +627,7 @@ void npy_set_floatstatus_invalid(void)
|
||||
}
|
||||
|
||||
|
||||
-#elif (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \
|
||||
+#elif (defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(__arc__)) || defined(__APPLE__) || \
|
||||
defined(__CYGWIN__) || defined(__MINGW32__) || \
|
||||
(defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
|
||||
# include <fenv.h>
|
||||
--
|
||||
2.16.2
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
|
||||
bool
|
||||
# Numpy has some CPU specific code
|
||||
# ARCompact build fails due to toolchain issue
|
||||
# ARC HS38 build fails on glibc due to missing FE_* definitions
|
||||
default y if BR2_arc && BR2_archs38 && !BR2_TOOLCHAIN_USES_GLIBC
|
||||
default y if BR2_arc
|
||||
default y if BR2_aarch64
|
||||
default y if BR2_arm
|
||||
default y if BR2_armeb
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copied from https://github.com/numpy/numpy/releases/tag/v1.13.3
|
||||
sha256 4c6b4eef790528bebb7ec9590d74cc193868940fe68e4109a91c196df72d8094 numpy-1.13.3.tar.gz
|
||||
# Copied from https://github.com/numpy/numpy/releases/tag/v1.15.1
|
||||
sha256 3c1ccce5d935ef8df16ae0595b459ef08a5cdb05aee195ebc04b9d89a72be7fa numpy-1.15.1.tar.gz
|
||||
# License files, locally calculated
|
||||
sha256 94eebc7c8f86a287c1e9146ed52ebcde88183806d848d8c66e0e52d1aebf3b13 LICENSE.txt
|
||||
sha256 9e85ee1c3f11444243c9b7667721592a01f1cd90cb28ad937ac99f6241d6b685 LICENSE.txt
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_NUMPY_VERSION = 1.13.3
|
||||
PYTHON_NUMPY_VERSION = 1.15.1
|
||||
PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz
|
||||
PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION)
|
||||
PYTHON_NUMPY_LICENSE = BSD-3-Clause
|
||||
@@ -14,6 +14,8 @@ PYTHON_NUMPY_SETUP_TYPE = setuptools
|
||||
ifeq ($(BR2_PACKAGE_CLAPACK),y)
|
||||
PYTHON_NUMPY_DEPENDENCIES += clapack
|
||||
PYTHON_NUMPY_SITE_CFG_LIBS += blas lapack
|
||||
else
|
||||
PYTHON_NUMPY_ENV += BLAS=None LAPACK=None
|
||||
endif
|
||||
|
||||
PYTHON_NUMPY_BUILD_OPTS = --fcompiler=None
|
||||
@@ -31,3 +33,4 @@ endef
|
||||
PYTHON_NUMPY_INSTALL_STAGING = YES
|
||||
|
||||
$(eval $(python-package))
|
||||
$(eval $(host-python-package))
|
||||
|
||||
Reference in New Issue
Block a user