diff options
Diffstat (limited to 'meta/recipes-devtools/python-numpy')
17 files changed, 414 insertions, 56 deletions
diff --git a/meta/recipes-devtools/python-numpy/files/add-glibc-check.patch b/meta/recipes-devtools/python-numpy/files/add-glibc-check.patch deleted file mode 100644 index 29768f34d2..0000000000 --- a/meta/recipes-devtools/python-numpy/files/add-glibc-check.patch +++ /dev/null @@ -1,36 +0,0 @@ -Dont punish musl for glibc's trignometeric functions problems -additionally ensure that glibc specific macros are not used -unconditionally - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending -Index: numpy-1.10.4/numpy/core/src/private/npy_config.h -=================================================================== ---- numpy-1.10.4.orig/numpy/core/src/private/npy_config.h -+++ numpy-1.10.4/numpy/core/src/private/npy_config.h -@@ -75,10 +75,12 @@ - - #if defined(HAVE_FEATURES_H) - #include <features.h> -+#ifdef __GLIBC__ - #define TRIG_OK __GLIBC_PREREQ(2, 16) - #else - #define TRIG_OK 0 - #endif -+#endif - - #if !TRIG_OK - #undef HAVE_CASIN -Index: numpy-1.10.4/numpy/core/src/npymath/ieee754.c.src -=================================================================== ---- numpy-1.10.4.orig/numpy/core/src/npymath/ieee754.c.src -+++ numpy-1.10.4/numpy/core/src/npymath/ieee754.c.src -@@ -612,7 +612,7 @@ void npy_set_floatstatus_invalid(void) - } - - --#elif defined(__GLIBC__) || defined(__APPLE__) || \ -+#elif defined(__linux__) || defined(__APPLE__) || \ - defined(__CYGWIN__) || defined(__MINGW32__) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) - # include <fenv.h> diff --git a/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch b/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch new file mode 100644 index 0000000000..8be6e4d21f --- /dev/null +++ b/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch @@ -0,0 +1,29 @@ +Upstream-Status: Inappropriate [embedded specific] + +Avoids using python from the HOSTs native sysroot for f2py, +uses TARGET env python instead. + +Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> + +Index: numpy-1.11.0/numpy/f2py/setup.py +=================================================================== +--- numpy-1.11.0.orig/numpy/f2py/setup.py ++++ numpy-1.11.0/numpy/f2py/setup.py +@@ -37,10 +37,13 @@ def _get_f2py_shebang(): + should be ``#!python`` rather than ``#!`` followed by the contents of + ``sys.executable``. + """ +- if set(('bdist_wheel', 'bdist_egg', 'bdist_wininst', +- 'bdist_rpm')).intersection(sys.argv): +- return '#!python' +- return '#!' + sys.executable ++ #if set(('bdist_wheel', 'bdist_egg', 'bdist_wininst', ++ # 'bdist_rpm')).intersection(sys.argv): ++ # return '#!python' ++ #return '#!' + sys.executable ++ ++ # On OE, we need to avoid using the HOSTs python-native, we return env python instead ++ return '#!/usr/bin/env python' + + + def configuration(parent_package='', top_path=None): diff --git a/meta/recipes-devtools/python-numpy/files/mips64n32/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mipsarchn32eb/_numpyconfig.h index 8e2b5d0940..8e2b5d0940 100644 --- a/meta/recipes-devtools/python-numpy/files/mips64n32/_numpyconfig.h +++ b/meta/recipes-devtools/python-numpy/files/mipsarchn32eb/_numpyconfig.h diff --git a/meta/recipes-devtools/python-numpy/files/mips64/config.h b/meta/recipes-devtools/python-numpy/files/mipsarchn32eb/config.h index c30b868f2f..c30b868f2f 100644 --- a/meta/recipes-devtools/python-numpy/files/mips64/config.h +++ b/meta/recipes-devtools/python-numpy/files/mipsarchn32eb/config.h diff --git a/meta/recipes-devtools/python-numpy/files/mipsarchn32el/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mipsarchn32el/_numpyconfig.h new file mode 100644 index 0000000000..8e2b5d0940 --- /dev/null +++ b/meta/recipes-devtools/python-numpy/files/mipsarchn32el/_numpyconfig.h @@ -0,0 +1,31 @@ +#define NPY_HAVE_ENDIAN_H 1 +#define NPY_SIZEOF_SHORT SIZEOF_SHORT +#define NPY_SIZEOF_INT SIZEOF_INT +#define NPY_SIZEOF_LONG SIZEOF_LONG +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_COMPLEX_FLOAT 8 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_COMPLEX_DOUBLE 16 +#define NPY_SIZEOF_LONGDOUBLE 16 +#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 +#define NPY_SIZEOF_PY_INTPTR_T 8 +#define NPY_SIZEOF_PY_LONG_LONG 8 +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_NO_SMP 0 +#define NPY_HAVE_DECL_ISNAN +#define NPY_HAVE_DECL_ISINF +#define NPY_HAVE_DECL_ISFINITE +#define NPY_HAVE_DECL_SIGNBIT +#define NPY_USE_C99_COMPLEX 1 +#define NPY_HAVE_COMPLEX_DOUBLE 1 +#define NPY_HAVE_COMPLEX_FLOAT 1 +#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1 +#define NPY_USE_C99_FORMATS 1 +#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) +#define NPY_ABI_VERSION 0x01000009 +#define NPY_API_VERSION 0x0000000A + +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS 1 +#endif diff --git a/meta/recipes-devtools/python-numpy/files/mipsarchn32el/config.h b/meta/recipes-devtools/python-numpy/files/mipsarchn32el/config.h new file mode 100644 index 0000000000..48727039ae --- /dev/null +++ b/meta/recipes-devtools/python-numpy/files/mipsarchn32el/config.h @@ -0,0 +1,138 @@ +#define SIZEOF_PY_INTPTR_T 8 +#define SIZEOF_PY_LONG_LONG 8 +#define MATHLIB m +#define HAVE_SIN 1 +#define HAVE_COS 1 +#define HAVE_TAN 1 +#define HAVE_SINH 1 +#define HAVE_COSH 1 +#define HAVE_TANH 1 +#define HAVE_FABS 1 +#define HAVE_FLOOR 1 +#define HAVE_CEIL 1 +#define HAVE_SQRT 1 +#define HAVE_LOG10 1 +#define HAVE_LOG 1 +#define HAVE_EXP 1 +#define HAVE_ASIN 1 +#define HAVE_ACOS 1 +#define HAVE_ATAN 1 +#define HAVE_FMOD 1 +#define HAVE_MODF 1 +#define HAVE_FREXP 1 +#define HAVE_LDEXP 1 +#define HAVE_RINT 1 +#define HAVE_TRUNC 1 +#define HAVE_EXP2 1 +#define HAVE_LOG2 1 +#define HAVE_ATAN2 1 +#define HAVE_POW 1 +#define HAVE_NEXTAFTER 1 +#define HAVE_SINF 1 +#define HAVE_COSF 1 +#define HAVE_TANF 1 +#define HAVE_SINHF 1 +#define HAVE_COSHF 1 +#define HAVE_TANHF 1 +#define HAVE_FABSF 1 +#define HAVE_FLOORF 1 +#define HAVE_CEILF 1 +#define HAVE_RINTF 1 +#define HAVE_TRUNCF 1 +#define HAVE_SQRTF 1 +#define HAVE_LOG10F 1 +#define HAVE_LOGF 1 +#define HAVE_LOG1PF 1 +#define HAVE_EXPF 1 +#define HAVE_EXPM1F 1 +#define HAVE_ASINF 1 +#define HAVE_ACOSF 1 +#define HAVE_ATANF 1 +#define HAVE_ASINHF 1 +#define HAVE_ACOSHF 1 +#define HAVE_ATANHF 1 +#define HAVE_HYPOTF 1 +#define HAVE_ATAN2F 1 +#define HAVE_POWF 1 +#define HAVE_FMODF 1 +#define HAVE_MODFF 1 +#define HAVE_FREXPF 1 +#define HAVE_LDEXPF 1 +#define HAVE_EXP2F 1 +#define HAVE_LOG2F 1 +#define HAVE_COPYSIGNF 1 +#define HAVE_NEXTAFTERF 1 +#define HAVE_SINL 1 +#define HAVE_COSL 1 +#define HAVE_TANL 1 +#define HAVE_SINHL 1 +#define HAVE_COSHL 1 +#define HAVE_TANHL 1 +#define HAVE_FABSL 1 +#define HAVE_FLOORL 1 +#define HAVE_CEILL 1 +#define HAVE_RINTL 1 +#define HAVE_TRUNCL 1 +#define HAVE_SQRTL 1 +#define HAVE_LOG10L 1 +#define HAVE_LOGL 1 +#define HAVE_LOG1PL 1 +#define HAVE_EXPL 1 +#define HAVE_EXPM1L 1 +#define HAVE_ASINL 1 +#define HAVE_ACOSL 1 +#define HAVE_ATANL 1 +#define HAVE_ASINHL 1 +#define HAVE_ACOSHL 1 +#define HAVE_ATANHL 1 +#define HAVE_HYPOTL 1 +#define HAVE_ATAN2L 1 +#define HAVE_POWL 1 +#define HAVE_FMODL 1 +#define HAVE_MODFL 1 +#define HAVE_FREXPL 1 +#define HAVE_LDEXPL 1 +#define HAVE_EXP2L 1 +#define HAVE_LOG2L 1 +#define HAVE_COPYSIGNL 1 +#define HAVE_NEXTAFTERL 1 +#define HAVE_DECL_SIGNBIT +#define HAVE_COMPLEX_H 1 +#define HAVE_CREAL 1 +#define HAVE_CIMAG 1 +#define HAVE_CABS 1 +#define HAVE_CARG 1 +#define HAVE_CEXP 1 +#define HAVE_CSQRT 1 +#define HAVE_CLOG 1 +#define HAVE_CCOS 1 +#define HAVE_CSIN 1 +#define HAVE_CPOW 1 +#define HAVE_CREALF 1 +#define HAVE_CIMAGF 1 +#define HAVE_CABSF 1 +#define HAVE_CARGF 1 +#define HAVE_CEXPF 1 +#define HAVE_CSQRTF 1 +#define HAVE_CLOGF 1 +#define HAVE_CCOSF 1 +#define HAVE_CSINF 1 +#define HAVE_CPOWF 1 +#define HAVE_CREALL 1 +#define HAVE_CIMAGL 1 +#define HAVE_CABSL 1 +#define HAVE_CARGL 1 +#define HAVE_CEXPL 1 +#define HAVE_CSQRTL 1 +#define HAVE_CLOGL 1 +#define HAVE_CCOSL 1 +#define HAVE_CSINL 1 +#define HAVE_CPOWL 1 +#define HAVE_LDOUBLE_IEEE_QUAD_LE 1 +#ifndef __cplusplus +/* #undef inline */ +#endif + +#ifndef _NPY_NPY_CONFIG_H_ +#error config.h should never be included directly, include npy_config.h instead +#endif diff --git a/meta/recipes-devtools/python-numpy/files/mips64/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mipsarchn64eb/_numpyconfig.h index debb390094..debb390094 100644 --- a/meta/recipes-devtools/python-numpy/files/mips64/_numpyconfig.h +++ b/meta/recipes-devtools/python-numpy/files/mipsarchn64eb/_numpyconfig.h diff --git a/meta/recipes-devtools/python-numpy/files/mips64n32/config.h b/meta/recipes-devtools/python-numpy/files/mipsarchn64eb/config.h index c30b868f2f..c30b868f2f 100644 --- a/meta/recipes-devtools/python-numpy/files/mips64n32/config.h +++ b/meta/recipes-devtools/python-numpy/files/mipsarchn64eb/config.h diff --git a/meta/recipes-devtools/python-numpy/files/mipsarchn64el/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mipsarchn64el/_numpyconfig.h new file mode 100644 index 0000000000..debb390094 --- /dev/null +++ b/meta/recipes-devtools/python-numpy/files/mipsarchn64el/_numpyconfig.h @@ -0,0 +1,32 @@ +#define NPY_HAVE_ENDIAN_H 1 +#define NPY_SIZEOF_SHORT SIZEOF_SHORT +#define NPY_SIZEOF_INT SIZEOF_INT +#define NPY_SIZEOF_LONG SIZEOF_LONG +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_COMPLEX_FLOAT 8 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_COMPLEX_DOUBLE 16 +#define NPY_SIZEOF_LONGDOUBLE 16 +#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 +#define NPY_SIZEOF_PY_INTPTR_T 8 +#define NPY_SIZEOF_PY_LONG_LONG 8 +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_SIZEOF_OFF_T 8 +#define NPY_NO_SMP 0 +#define NPY_HAVE_DECL_ISNAN +#define NPY_HAVE_DECL_ISINF +#define NPY_HAVE_DECL_ISFINITE +#define NPY_HAVE_DECL_SIGNBIT +#define NPY_USE_C99_COMPLEX 1 +#define NPY_HAVE_COMPLEX_DOUBLE 1 +#define NPY_HAVE_COMPLEX_FLOAT 1 +#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1 +#define NPY_USE_C99_FORMATS 1 +#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) +#define NPY_ABI_VERSION 0x01000009 +#define NPY_API_VERSION 0x0000000A + +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS 1 +#endif diff --git a/meta/recipes-devtools/python-numpy/files/mipsarchn64el/config.h b/meta/recipes-devtools/python-numpy/files/mipsarchn64el/config.h new file mode 100644 index 0000000000..48727039ae --- /dev/null +++ b/meta/recipes-devtools/python-numpy/files/mipsarchn64el/config.h @@ -0,0 +1,138 @@ +#define SIZEOF_PY_INTPTR_T 8 +#define SIZEOF_PY_LONG_LONG 8 +#define MATHLIB m +#define HAVE_SIN 1 +#define HAVE_COS 1 +#define HAVE_TAN 1 +#define HAVE_SINH 1 +#define HAVE_COSH 1 +#define HAVE_TANH 1 +#define HAVE_FABS 1 +#define HAVE_FLOOR 1 +#define HAVE_CEIL 1 +#define HAVE_SQRT 1 +#define HAVE_LOG10 1 +#define HAVE_LOG 1 +#define HAVE_EXP 1 +#define HAVE_ASIN 1 +#define HAVE_ACOS 1 +#define HAVE_ATAN 1 +#define HAVE_FMOD 1 +#define HAVE_MODF 1 +#define HAVE_FREXP 1 +#define HAVE_LDEXP 1 +#define HAVE_RINT 1 +#define HAVE_TRUNC 1 +#define HAVE_EXP2 1 +#define HAVE_LOG2 1 +#define HAVE_ATAN2 1 +#define HAVE_POW 1 +#define HAVE_NEXTAFTER 1 +#define HAVE_SINF 1 +#define HAVE_COSF 1 +#define HAVE_TANF 1 +#define HAVE_SINHF 1 +#define HAVE_COSHF 1 +#define HAVE_TANHF 1 +#define HAVE_FABSF 1 +#define HAVE_FLOORF 1 +#define HAVE_CEILF 1 +#define HAVE_RINTF 1 +#define HAVE_TRUNCF 1 +#define HAVE_SQRTF 1 +#define HAVE_LOG10F 1 +#define HAVE_LOGF 1 +#define HAVE_LOG1PF 1 +#define HAVE_EXPF 1 +#define HAVE_EXPM1F 1 +#define HAVE_ASINF 1 +#define HAVE_ACOSF 1 +#define HAVE_ATANF 1 +#define HAVE_ASINHF 1 +#define HAVE_ACOSHF 1 +#define HAVE_ATANHF 1 +#define HAVE_HYPOTF 1 +#define HAVE_ATAN2F 1 +#define HAVE_POWF 1 +#define HAVE_FMODF 1 +#define HAVE_MODFF 1 +#define HAVE_FREXPF 1 +#define HAVE_LDEXPF 1 +#define HAVE_EXP2F 1 +#define HAVE_LOG2F 1 +#define HAVE_COPYSIGNF 1 +#define HAVE_NEXTAFTERF 1 +#define HAVE_SINL 1 +#define HAVE_COSL 1 +#define HAVE_TANL 1 +#define HAVE_SINHL 1 +#define HAVE_COSHL 1 +#define HAVE_TANHL 1 +#define HAVE_FABSL 1 +#define HAVE_FLOORL 1 +#define HAVE_CEILL 1 +#define HAVE_RINTL 1 +#define HAVE_TRUNCL 1 +#define HAVE_SQRTL 1 +#define HAVE_LOG10L 1 +#define HAVE_LOGL 1 +#define HAVE_LOG1PL 1 +#define HAVE_EXPL 1 +#define HAVE_EXPM1L 1 +#define HAVE_ASINL 1 +#define HAVE_ACOSL 1 +#define HAVE_ATANL 1 +#define HAVE_ASINHL 1 +#define HAVE_ACOSHL 1 +#define HAVE_ATANHL 1 +#define HAVE_HYPOTL 1 +#define HAVE_ATAN2L 1 +#define HAVE_POWL 1 +#define HAVE_FMODL 1 +#define HAVE_MODFL 1 +#define HAVE_FREXPL 1 +#define HAVE_LDEXPL 1 +#define HAVE_EXP2L 1 +#define HAVE_LOG2L 1 +#define HAVE_COPYSIGNL 1 +#define HAVE_NEXTAFTERL 1 +#define HAVE_DECL_SIGNBIT +#define HAVE_COMPLEX_H 1 +#define HAVE_CREAL 1 +#define HAVE_CIMAG 1 +#define HAVE_CABS 1 +#define HAVE_CARG 1 +#define HAVE_CEXP 1 +#define HAVE_CSQRT 1 +#define HAVE_CLOG 1 +#define HAVE_CCOS 1 +#define HAVE_CSIN 1 +#define HAVE_CPOW 1 +#define HAVE_CREALF 1 +#define HAVE_CIMAGF 1 +#define HAVE_CABSF 1 +#define HAVE_CARGF 1 +#define HAVE_CEXPF 1 +#define HAVE_CSQRTF 1 +#define HAVE_CLOGF 1 +#define HAVE_CCOSF 1 +#define HAVE_CSINF 1 +#define HAVE_CPOWF 1 +#define HAVE_CREALL 1 +#define HAVE_CIMAGL 1 +#define HAVE_CABSL 1 +#define HAVE_CARGL 1 +#define HAVE_CEXPL 1 +#define HAVE_CSQRTL 1 +#define HAVE_CLOGL 1 +#define HAVE_CCOSL 1 +#define HAVE_CSINL 1 +#define HAVE_CPOWL 1 +#define HAVE_LDOUBLE_IEEE_QUAD_LE 1 +#ifndef __cplusplus +/* #undef inline */ +#endif + +#ifndef _NPY_NPY_CONFIG_H_ +#error config.h should never be included directly, include npy_config.h instead +#endif diff --git a/meta/recipes-devtools/python-numpy/files/mips/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mipsarcho32eb/_numpyconfig.h index 05d2b8b949..4c465c216c 100644 --- a/meta/recipes-devtools/python-numpy/files/mips/_numpyconfig.h +++ b/meta/recipes-devtools/python-numpy/files/mipsarcho32eb/_numpyconfig.h @@ -12,6 +12,7 @@ #define NPY_SIZEOF_PY_INTPTR_T 4 #define NPY_SIZEOF_PY_LONG_LONG 8 #define NPY_SIZEOF_LONGLONG 8 +#define NPY_SIZEOF_OFF_T 8 #define NPY_NO_SMP 0 #define NPY_HAVE_DECL_ISNAN #define NPY_HAVE_DECL_ISINF diff --git a/meta/recipes-devtools/python-numpy/files/mips/config.h b/meta/recipes-devtools/python-numpy/files/mipsarcho32eb/config.h index 2f6135adce..2f6135adce 100644 --- a/meta/recipes-devtools/python-numpy/files/mips/config.h +++ b/meta/recipes-devtools/python-numpy/files/mipsarcho32eb/config.h diff --git a/meta/recipes-devtools/python-numpy/files/mipsel/config.h b/meta/recipes-devtools/python-numpy/files/mipsarcho32el/config.h index 17ef186d56..17ef186d56 100644 --- a/meta/recipes-devtools/python-numpy/files/mipsel/config.h +++ b/meta/recipes-devtools/python-numpy/files/mipsarcho32el/config.h diff --git a/meta/recipes-devtools/python-numpy/files/mipsel/numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mipsarcho32el/numpyconfig.h index c4bf6547f0..0b7cd51af4 100644 --- a/meta/recipes-devtools/python-numpy/files/mipsel/numpyconfig.h +++ b/meta/recipes-devtools/python-numpy/files/mipsarcho32el/numpyconfig.h @@ -13,5 +13,6 @@ #define NPY_SIZEOF_LONGLONG 8 #define NPY_SIZEOF_PY_LONG_LONG 8 +#define NPY_SIZEOF_OFF_T 8 /* #define CHAR_BIT 8 */ diff --git a/meta/recipes-devtools/python-numpy/files/powerpc/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/powerpc/_numpyconfig.h index 0f45d5bd44..6e7262ad91 100644 --- a/meta/recipes-devtools/python-numpy/files/powerpc/_numpyconfig.h +++ b/meta/recipes-devtools/python-numpy/files/powerpc/_numpyconfig.h @@ -12,6 +12,7 @@ #define NPY_SIZEOF_PY_INTPTR_T 4 #define NPY_SIZEOF_PY_LONG_LONG 8 #define NPY_SIZEOF_LONGLONG 8 +#define NPY_SIZEOF_OFF_T 8 #define NPY_NO_SMP 0 #define NPY_HAVE_DECL_ISNAN #define NPY_HAVE_DECL_ISINF diff --git a/meta/recipes-devtools/python-numpy/python-numpy_1.10.4.bb b/meta/recipes-devtools/python-numpy/python-numpy_1.11.2.bb index ca6a7abb0e..c4bc354036 100644 --- a/meta/recipes-devtools/python-numpy/python-numpy_1.10.4.bb +++ b/meta/recipes-devtools/python-numpy/python-numpy_1.11.2.bb @@ -1,13 +1,16 @@ SUMMARY = "A sophisticated Numeric Processing Package for Python" SECTION = "devel/python" LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9f4e88b5748e8313caaf33d081ce65a3" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7e51a5677b22b865abbfb3dff6ffb2d0" -SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \ +SRCNAME = "numpy" + +SRC_URI = "https://files.pythonhosted.org/packages/source/n/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ file://remove-build-path-in-comments.patch \ - file://add-glibc-check.patch \ + file://fix_shebang_f2py.patch \ ${CONFIGFILESURI} " +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/numpy/files/" CONFIGFILESURI ?= "" @@ -23,7 +26,7 @@ CONFIGFILESURI_armeb = " \ file://config.h \ file://numpyconfig.h \ " -CONFIGFILESURI_mipsel = " \ +CONFIGFILESURI_mipsarcho32el = " \ file://config.h \ file://numpyconfig.h \ " @@ -35,7 +38,7 @@ CONFIGFILESURI_x86-64 = " \ file://config.h \ file://_numpyconfig.h \ " -CONFIGFILESURI_mips = " \ +CONFIGFILESURI_mipsarcho32eb = " \ file://config.h \ file://_numpyconfig.h \ " @@ -47,18 +50,26 @@ CONFIGFILESURI_powerpc64 = " \ file://config.h \ file://_numpyconfig.h \ " -CONFIGFILESURI_mips64 = " \ +CONFIGFILESURI_mipsarchn64eb = " \ + file://config.h \ + file://_numpyconfig.h \ +" +CONFIGFILESURI_mipsarchn64el = " \ + file://config.h \ + file://_numpyconfig.h \ +" +CONFIGFILESURI_mipsarchn32eb = " \ file://config.h \ file://_numpyconfig.h \ " -CONFIGFILESURI_mips64n32 = " \ +CONFIGFILESURI_mipsarchn32el = " \ file://config.h \ file://_numpyconfig.h \ " S = "${WORKDIR}/numpy-${PV}" -inherit distutils +inherit setuptools # Make the build fail and replace *config.h with proper one # This is a ugly, ugly hack - Koen @@ -70,8 +81,8 @@ do_compile_prepend_class-target() { FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a" -SRC_URI[md5sum] = "90bb9034652cefbada19cf7d141a6a61" -SRC_URI[sha256sum] = "f7f91842056a7cf680b0eaf8cefc5e46c69e2521e651128d2e6aaaccec8652ae" +SRC_URI[md5sum] = "03bd7927c314c43780271bf1ab795ebc" +SRC_URI[sha256sum] = "04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69" # install what is needed for numpy.test() RDEPENDS_${PN} = "python-unittest \ diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.10.4.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.11.2.bb index dcd23ac98d..d5fe50c36f 100644 --- a/meta/recipes-devtools/python-numpy/python3-numpy_1.10.4.bb +++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.11.2.bb @@ -1,13 +1,16 @@ SUMMARY = "A sophisticated Numeric Processing Package for Python" SECTION = "devel/python" LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9f4e88b5748e8313caaf33d081ce65a3" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7e51a5677b22b865abbfb3dff6ffb2d0" -SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \ +SRCNAME = "numpy" + +SRC_URI = "https://files.pythonhosted.org/packages/source/n/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ file://remove-build-path-in-comments.patch \ - file://add-glibc-check.patch \ + file://fix_shebang_f2py.patch \ ${CONFIGFILESURI} " +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/numpy/files/" CONFIGFILESURI ?= "" @@ -23,7 +26,7 @@ CONFIGFILESURI_armeb = " \ file://config.h \ file://numpyconfig.h \ " -CONFIGFILESURI_mipsel = " \ +CONFIGFILESURI_mipsarcho32el = " \ file://config.h \ file://numpyconfig.h \ " @@ -35,7 +38,7 @@ CONFIGFILESURI_x86-64 = " \ file://config.h \ file://_numpyconfig.h \ " -CONFIGFILESURI_mips = " \ +CONFIGFILESURI_mipsarcho32eb = " \ file://config.h \ file://_numpyconfig.h \ " @@ -47,18 +50,26 @@ CONFIGFILESURI_powerpc64 = " \ file://config.h \ file://_numpyconfig.h \ " -CONFIGFILESURI_mips64 = " \ +CONFIGFILESURI_mipsarchn64eb = " \ + file://config.h \ + file://_numpyconfig.h \ +" +CONFIGFILESURI_mipsarchn64el = " \ + file://config.h \ + file://_numpyconfig.h \ +" +CONFIGFILESURI_mipsarchn32eb = " \ file://config.h \ file://_numpyconfig.h \ " -CONFIGFILESURI_mips64n32 = " \ +CONFIGFILESURI_mipsarchn32el = " \ file://config.h \ file://_numpyconfig.h \ " S = "${WORKDIR}/numpy-${PV}" -inherit distutils3 +inherit setuptools3 # Make the build fail and replace *config.h with proper one # This is a ugly, ugly hack - Koen @@ -70,8 +81,8 @@ do_compile_prepend_class-target() { FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a" -SRC_URI[md5sum] = "90bb9034652cefbada19cf7d141a6a61" -SRC_URI[sha256sum] = "f7f91842056a7cf680b0eaf8cefc5e46c69e2521e651128d2e6aaaccec8652ae" +SRC_URI[md5sum] = "03bd7927c314c43780271bf1ab795ebc" +SRC_URI[sha256sum] = "04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69" # install what is needed for numpy.test() RDEPENDS_${PN} = "python3-unittest \ @@ -94,6 +105,7 @@ RDEPENDS_${PN} = "python3-unittest \ python3-compression \ python3-ctypes \ python3-threading \ + python3-textutils \ " RDEPENDS_${PN}_class-native = "" |