numpy, bump version (#5647)

This commit is contained in:
Schrijvers Luc
2021-01-31 11:37:33 +01:00
committed by GitHub
parent 9594c83b13
commit aff2c5aa26
2 changed files with 6 additions and 21 deletions

View File

@@ -7,15 +7,14 @@ numarray as well as an extended C-API and the ability to create arrays of \
arbitrary type which also makes NumPy suitable for interfacing with \
general-purpose data-base applications."
HOMEPAGE="https://www.numpy.org/"
COPYRIGHT="2005-2020 Travis E. Oliphant et al."
COPYRIGHT="2005-2021 Travis E. Oliphant et al."
LICENSE="BSD (3-clause)"
REVISION="1"
SOURCE_URI="https://github.com/numpy/numpy/releases/download/v$portVersion/numpy-$portVersion.tar.gz"
CHECKSUM_SHA256="fe836a685d6838dbb3f603caef01183ea98e88febf4ce956a2ea484a75378413"
CHECKSUM_SHA256="67b630745a71b541ff6517d6f3d62b00690dc8ba0684cad0d7b0ac55aec1de53"
SOURCE_DIR="numpy-$portVersion"
#PATCHES="numpy-$portVersion.patch"
ARCHITECTURES="x86 x86_64"
ARCHITECTURES="!x86_gcc2 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
@@ -44,8 +43,8 @@ BUILD_REQUIRES="
# devel:libumfpack$secondaryArchSuffix
"
PYTHON_PACKAGES=(python36 python3)
PYTHON_VERSIONS=(3.6 3.7)
PYTHON_PACKAGES=(python3 python38)
PYTHON_VERSIONS=(3.7 3.8)
for i in "${!PYTHON_PACKAGES[@]}"; do
pythonPackage=${PYTHON_PACKAGES[i]}
pythonVersion=${PYTHON_VERSIONS[$i]}
@@ -56,6 +55,7 @@ eval "PROVIDES_${pythonPackage}=\"\
\"; \
REQUIRES_$pythonPackage=\"\
haiku$secondaryArchSuffix\n\
numpy$secondaryArchSuffix\n\
cmd:cython$pythonVersion$secondaryArchSuffix\n\
cmd:python$pythonVersion\
\""

View File

@@ -1,15 +0,0 @@
diff --git a/numpy/core/src/umath/cpuid.c b/numpy/core/src/umath/cpuid.c
index 6744ceb..b1aaa09 100644
--- a/numpy/core/src/umath/cpuid.c
+++ b/numpy/core/src/umath/cpuid.c
@@ -19,7 +19,9 @@
static NPY_INLINE
int os_avx_support(void)
{
-#if HAVE_XGETBV
+// See, GCC bug < 7.3.1
+// https://github.com/numpy/numpy/pull/10814
+#if 0
/*
* use bytes for xgetbv to avoid issues with compiler not knowing the
* instruction