diff --git a/srcpkgs/python-numpy/patches/musl.patch b/srcpkgs/python-numpy/patches/musl.patch index c45954d391d..b3f7909cd1a 100644 --- a/srcpkgs/python-numpy/patches/musl.patch +++ b/srcpkgs/python-numpy/patches/musl.patch @@ -1,19 +1,9 @@ ---- numpy/core/src/private/npy_config.h.orig 2015-08-11 19:03:43.000000000 +0200 -+++ numpy/core/src/private/npy_config.h 2015-10-08 08:20:25.489203036 +0200 -@@ -71,7 +71,7 @@ - - - /* Disable broken gnu trig functions on linux */ --#if defined(__linux__) && defined(__GNUC__) -+#if defined(__linux__) && defined(__GLIBC__) - - #if defined(HAVE_FEATURES_H) - #include -@@ -96,6 +96,6 @@ - #endif - #undef TRIG_OK - --#endif /* defined(__linux__) && defined(__GNUC__) */ -+#endif /* defined(__linux__) && defined(__GLIBC__) */ - +--- numpy/core/src/multiarray/numpyos.c.orig ++++ numpy/core/src/multiarray/numpyos.c +@@ -15,7 +15,7 @@ + + #ifdef HAVE_STRTOLD_L + #include +-#include ++#include #endif diff --git a/srcpkgs/python-numpy/template b/srcpkgs/python-numpy/template index 5116b7e2eb4..7093948fe7b 100644 --- a/srcpkgs/python-numpy/template +++ b/srcpkgs/python-numpy/template @@ -1,28 +1,24 @@ # Template file for 'python-numpy' pkgname=python-numpy -version=1.10.4 -revision=4 +version=1.11.0 +revision=1 wrksrc="numpy-${version}" build_style=python-module python_versions="2.7 3.4" hostmakedepends="python-setuptools python3.4-setuptools gcc-fortran" -makedepends="python-devel python3.4-devel lapack-devel" +makedepends="python-devel python3.4-devel lapack-devel cblas-devel" pycompile_module="numpy" short_desc="Fast and sophisticated array facility to Python2" maintainer="Alessio Sergi " homepage="http://www.numpy.org/" license="3-clause-BSD" distfiles="${PYPI_SITE}/n/numpy/numpy-${version}.tar.gz" -checksum=7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b +checksum=a1d1268d200816bfb9727a7a27b78d8e37ecec2e4d5ebd33eb64e2789e0db43e alternatives=" numpy:f2py:/usr/bin/f2py2.7 numpy:f2py.1:/usr/share/man/man1/f2py2.7.1" -case "$XBPS_TARGET_MACHINE" in - i686|x86_64) makedepends+=" cblas-devel";; -esac - export ATLAS=None LDFLAGS="-shared"