mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
numpy: bump version.
keep 1.16.5 for python 2.7.
This commit is contained in:
@@ -11,7 +11,7 @@ COPYRIGHT="2005-2019 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="2b63c414fb43a4f0cb69b29b7e9d48275af0dbb5b1ffd2f2de99c4df9967e151"
|
||||
CHECKSUM_SHA256="81a4f748dcfa80a7071ad8f3d9f8edb9f8bc1f0a9bdd19bfd44fd42c02bd286c"
|
||||
SOURCE_DIR="numpy-$portVersion"
|
||||
PATCHES="numpy-$portVersion.patch"
|
||||
|
||||
@@ -44,8 +44,8 @@ BUILD_REQUIRES="
|
||||
# devel:libumfpack$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PYTHON_PACKAGES=(python python36 python3)
|
||||
PYTHON_VERSIONS=(2.7 3.6 3.7)
|
||||
PYTHON_PACKAGES=(python36 python3)
|
||||
PYTHON_VERSIONS=(3.6 3.7)
|
||||
for i in "${!PYTHON_PACKAGES[@]}"; do
|
||||
pythonPackage=${PYTHON_PACKAGES[i]}
|
||||
pythonVersion=${PYTHON_VERSIONS[$i]}
|
||||
@@ -70,9 +70,6 @@ BUILD_PREREQUIRES="$BUILD_PREREQUIRES
|
||||
"
|
||||
done
|
||||
|
||||
REPLACES_python="
|
||||
python_numpy
|
||||
"
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
@@ -114,11 +111,11 @@ EOF
|
||||
rm -rf build
|
||||
$python setup.py build install \
|
||||
--root=/ --prefix=$prefix
|
||||
rm -rf $binDir/f2py
|
||||
rm -rf $prefix/bin/f2py
|
||||
|
||||
packageEntries $pythonPackage \
|
||||
$prefix/lib/python* \
|
||||
$binDir
|
||||
$prefix/bin
|
||||
done
|
||||
}
|
||||
|
||||
@@ -129,6 +126,6 @@ TEST()
|
||||
pythonVersion=${PYTHON_VERSIONS[$i]}
|
||||
|
||||
python=python$pythonVersion
|
||||
$python run_tests.py
|
||||
$python runtests.py
|
||||
done
|
||||
}
|
||||
103
dev-python/numpy/numpy_python-1.16.5.recipe
Normal file
103
dev-python/numpy/numpy_python-1.16.5.recipe
Normal file
@@ -0,0 +1,103 @@
|
||||
SUMMARY="Array processing for numbers, strings, records, and objects"
|
||||
DESCRIPTION="NumPy is a general-purpose array-processing package designed to \
|
||||
efficiently manipulate large multi-dimensional arrays of arbitrary records \
|
||||
without sacrificing too much speed for small multi-dimensional arrays.
|
||||
NumPy is built on the Numeric code base and adds features introduced by \
|
||||
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="http://numpy.scipy.org/"
|
||||
COPYRIGHT="2005-2019 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="2b63c414fb43a4f0cb69b29b7e9d48275af0dbb5b1ffd2f2de99c4df9967e151"
|
||||
SOURCE_DIR="numpy-$portVersion"
|
||||
PATCHES="numpy-$portVersion.patch"
|
||||
|
||||
ARCHITECTURES="x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="?x86"
|
||||
|
||||
PROVIDES="
|
||||
$portName = $portVersion
|
||||
cmd:f2py2.7
|
||||
cmd:f2py2
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
# lib:libamd$secondaryArchSuffix
|
||||
lib:libblis$secondaryArchSuffix
|
||||
lib:libexecinfo$secondaryArchSuffix
|
||||
# lib:libfftw3$secondaryArchSuffix
|
||||
lib:liblapack$secondaryArchSuffix
|
||||
lib:libopenblas$secondaryArchSuffix
|
||||
# lib:libumfpack$secondaryArchSuffix
|
||||
cmd:python2.7
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
# devel:cblas$secondaryArchSuffix
|
||||
# devel:libamd$secondaryArchSuffix
|
||||
devel:libblis$secondaryArchSuffix
|
||||
devel:libexecinfo$secondaryArchSuffix
|
||||
# devel:libfftw3$secondaryArchSuffix
|
||||
devel:liblapack$secondaryArchSuffix
|
||||
devel:libopenblas$secondaryArchSuffix
|
||||
# devel:libumfpack$secondaryArchSuffix
|
||||
setuptools_python
|
||||
"
|
||||
BUILD_PREREQUIRES="$BUILD_PREREQUIRES
|
||||
cmd:git
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:gfortran$secondaryArchSuffix
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:python2.7
|
||||
"
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
# Check at every update in site.cfg.example!
|
||||
cat > site.cfg << EOF
|
||||
[ALL]
|
||||
libraries = execinfo,lapack,openblas
|
||||
library_dirs = /system/$relativeDevelopLibDir
|
||||
include_dirs = /system/$relativeIncludeDir
|
||||
runtime_library_dirs = /system/$relativeLibDir
|
||||
[openblas]
|
||||
libraries = openblas
|
||||
library_dirs = /system/$relativeDevelopLibDir
|
||||
include_dirs = /system/$relativeIncludeDir
|
||||
runtime_library_dirs = /system/$relativeLibDir
|
||||
[blis]
|
||||
libraries = blis
|
||||
library_dirs = /system/$relativeDevelopLibDir
|
||||
include_dirs = /system/$relativeIncludeDir/blis
|
||||
runtime_library_dirs = /system/$relativeLibDir
|
||||
#[amd]
|
||||
#amd_libs = amd
|
||||
#[umfpack]
|
||||
#umfpack_libs = umfpack
|
||||
#[fftw]
|
||||
#libraries = fftw3
|
||||
EOF
|
||||
|
||||
rm -rf doc/sphinxext/.git
|
||||
|
||||
pythonPackage=python
|
||||
pythonVersion=2.7
|
||||
|
||||
python=python$pythonVersion
|
||||
installLocation=$prefix/lib/$python/vendor-packages/
|
||||
export PYTHONPATH=$installLocation:$PYTHONPATH
|
||||
mkdir -p $installLocation
|
||||
rm -rf build
|
||||
$python setup.py build install \
|
||||
--root=/ --prefix=$prefix
|
||||
rm -rf $binDir/f2py
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
python2.7 runtests.py
|
||||
}
|
||||
15
dev-python/numpy/patches/numpy-1.17.2.patch
Normal file
15
dev-python/numpy/patches/numpy-1.17.2.patch
Normal file
@@ -0,0 +1,15 @@
|
||||
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
|
||||
Reference in New Issue
Block a user