* [meta-oe][PATCH 1/2] python-nose: add 1.2.1 @ 2013-01-30 7:50 Marcin Juszkiewicz 2013-01-30 7:50 ` [meta-oe][PATCH 2/2] python-numpy: add 1.7.0-rc1 Marcin Juszkiewicz 0 siblings, 1 reply; 5+ messages in thread From: Marcin Juszkiewicz @ 2013-01-30 7:50 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> --- meta-oe/recipes-devtools/python/python-nose_1.2.1.bb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 meta-oe/recipes-devtools/python/python-nose_1.2.1.bb diff --git a/meta-oe/recipes-devtools/python/python-nose_1.2.1.bb b/meta-oe/recipes-devtools/python/python-nose_1.2.1.bb new file mode 100644 index 0000000..083d052 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-nose_1.2.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "nose extends the test loading and running features of unittest, \ +making it easier to write, find and run tests." +SECTION = "devel/python" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://lgpl.txt;md5=a6f89e2100d9b6cdffcea4f398e37343" + +SRC_URI = "http://pypi.python.org/packages/source/n/nose/nose-${PV}.tar.gz" + +SRC_URI[md5sum] = "735e3f1ce8b07e70ee1b742a8a53585a" +SRC_URI[sha256sum] = "2171e9202d118d302d5db1decb52dd862b79e2a626ca19653a6914574a6ca7d9" + +S = "${WORKDIR}/nose-${PV}" + +inherit distutils -- 1.8.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [meta-oe][PATCH 2/2] python-numpy: add 1.7.0-rc1 2013-01-30 7:50 [meta-oe][PATCH 1/2] python-nose: add 1.2.1 Marcin Juszkiewicz @ 2013-01-30 7:50 ` Marcin Juszkiewicz 2013-01-30 10:45 ` Martin Jansa 0 siblings, 1 reply; 5+ messages in thread From: Marcin Juszkiewicz @ 2013-01-30 7:50 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> --- .../python/python-numpy/aarch64.patch | 41 ++++++ .../python/python-numpy/aarch64/_numpyconfig.h | 30 +++++ .../python/python-numpy/aarch64/config.h | 139 +++++++++++++++++++++ ...python-numpy_1.4.1.bb => python-numpy_1.7.0.bb} | 33 +++-- 4 files changed, 236 insertions(+), 7 deletions(-) create mode 100644 meta-oe/recipes-devtools/python/python-numpy/aarch64.patch create mode 100644 meta-oe/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h create mode 100644 meta-oe/recipes-devtools/python/python-numpy/aarch64/config.h rename meta-oe/recipes-devtools/python/{python-numpy_1.4.1.bb => python-numpy_1.7.0.bb} (50%) diff --git a/meta-oe/recipes-devtools/python/python-numpy/aarch64.patch b/meta-oe/recipes-devtools/python/python-numpy/aarch64.patch new file mode 100644 index 0000000..60d0d00 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-numpy/aarch64.patch @@ -0,0 +1,41 @@ +From 7d7a5939dcf5821d9f381d57bfa2012568ef6b82 Mon Sep 17 00:00:00 2001 +From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> +Date: Thu, 10 Jan 2013 21:49:01 +0100 +Subject: [PATCH] Added support for AArch64 architecture + +Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> + +Upstream-status: backport +--- + numpy/core/include/numpy/npy_cpu.h | 2 ++ + numpy/core/include/numpy/npy_endian.h | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h +index 8a29788..9707a7a 100644 +--- a/numpy/core/include/numpy/npy_cpu.h ++++ b/numpy/core/include/numpy/npy_cpu.h +@@ -66,6 +66,8 @@ + #define NPY_CPU_MIPSEL + #elif defined(__MIPSEB__) + #define NPY_CPU_MIPSEB ++#elif defined(__aarch64__) ++ #define NPY_CPU_AARCH64 + #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 aa5ed8b..4e3349f 100644 +--- a/numpy/core/include/numpy/npy_endian.h ++++ b/numpy/core/include/numpy/npy_endian.h +@@ -25,6 +25,7 @@ + || defined(NPY_CPU_IA64) \ + || defined(NPY_CPU_ALPHA) \ + || defined(NPY_CPU_ARMEL) \ ++ || defined(NPY_CPU_AARCH64) \ + || defined(NPY_CPU_SH_LE) \ + || defined(NPY_CPU_MIPSEL) + #define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN +-- +1.8.0 + diff --git a/meta-oe/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h b/meta-oe/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h new file mode 100644 index 0000000..be57ac2 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h @@ -0,0 +1,30 @@ +#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_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 0x00000007 + +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS 1 +#endif diff --git a/meta-oe/recipes-devtools/python/python-numpy/aarch64/config.h b/meta-oe/recipes-devtools/python/python-numpy/aarch64/config.h new file mode 100644 index 0000000..c30b868 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-numpy/aarch64/config.h @@ -0,0 +1,139 @@ +#define HAVE_ENDIAN_H 1 +#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-oe/recipes-devtools/python/python-numpy_1.4.1.bb b/meta-oe/recipes-devtools/python/python-numpy_1.7.0.bb similarity index 50% rename from meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb rename to meta-oe/recipes-devtools/python/python-numpy_1.7.0.bb index 2bede09..2e4bd6a 100644 --- a/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb +++ b/meta-oe/recipes-devtools/python/python-numpy_1.7.0.bb @@ -1,14 +1,20 @@ DESCRIPTION = "A sophisticated Numeric Processing Package for Python" SECTION = "devel/python" LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3c42211d73c3faa1026e671dd39883fa" -PR = "r5" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f87832d854acbade6e9f5c601c8b30b1" +PR = "r0" +PV = "1.6.99+1.7.0rc1" +REALPV = "1.7.0rc1" -SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \ +SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${REALPV}.tar.gz \ ${CONFIGFILESURI} \ + file://aarch64.patch \ " CONFIGFILESURI ?= "" +CONFIGFILESURI_aarch64 = "file://config.h \ + file://_numpyconfig.h \ + " CONFIGFILESURI_arm = "file://config.h \ file://numpyconfig.h \ " @@ -16,7 +22,7 @@ CONFIGFILESURI_mipsel = "file://config.h \ file://numpyconfig.h \ " -S = "${WORKDIR}/numpy-${PV}" +S = "${WORKDIR}/numpy-${REALPV}" inherit distutils @@ -29,14 +35,27 @@ do_compile_prepend() { cp ${WORKDIR}/*config.h ${S}/build/$(ls ${S}/build | grep src)/numpy/core/include/numpy/ } -SRC_URI[md5sum] = "5c7b5349dc3161763f7f366ceb96516b" -SRC_URI[sha256sum] = "2e7bb84573e5123e07f3c919fd433bc09b78d606252b6b719e385c2a981d8e06" - FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a" +SRC_URI[md5sum] = "a4719f5a1853bc0f8892a5956d5c4229" +SRC_URI[sha256sum] = "45ea23622f72d86bc3614446d668ee962c0475ee7b91a93ef85a5e0493962de5" +# install what is needed for numpy.test() RDEPENDS_${PN} = "python-unittest \ python-difflib \ python-pprint \ python-pickle \ python-shell \ + python-nose \ + python-doctest \ + python-datetime \ + python-distutils \ + python-misc \ + python-mmap \ + python-netclient \ + python-numbers \ + python-pydoc \ + python-pkgutil \ + python-email \ + python-subprocess \ + python-compression \ " -- 1.8.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH 2/2] python-numpy: add 1.7.0-rc1 2013-01-30 7:50 ` [meta-oe][PATCH 2/2] python-numpy: add 1.7.0-rc1 Marcin Juszkiewicz @ 2013-01-30 10:45 ` Martin Jansa 2013-02-05 8:58 ` [meta-oe][PATCH] python-numpy: add 1.7.0rc1 Marcin Juszkiewicz 0 siblings, 1 reply; 5+ messages in thread From: Martin Jansa @ 2013-01-30 10:45 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 11199 bytes --] On Wed, Jan 30, 2013 at 08:50:39AM +0100, Marcin Juszkiewicz wrote: > Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> > --- > .../python/python-numpy/aarch64.patch | 41 ++++++ > .../python/python-numpy/aarch64/_numpyconfig.h | 30 +++++ > .../python/python-numpy/aarch64/config.h | 139 +++++++++++++++++++++ > ...python-numpy_1.4.1.bb => python-numpy_1.7.0.bb} | 33 +++-- Can we add rc1 to recipe name? python-numpy_1.7.0-rc1.bb > 4 files changed, 236 insertions(+), 7 deletions(-) > create mode 100644 meta-oe/recipes-devtools/python/python-numpy/aarch64.patch > create mode 100644 meta-oe/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h > create mode 100644 meta-oe/recipes-devtools/python/python-numpy/aarch64/config.h > rename meta-oe/recipes-devtools/python/{python-numpy_1.4.1.bb => python-numpy_1.7.0.bb} (50%) > > diff --git a/meta-oe/recipes-devtools/python/python-numpy/aarch64.patch b/meta-oe/recipes-devtools/python/python-numpy/aarch64.patch > new file mode 100644 > index 0000000..60d0d00 > --- /dev/null > +++ b/meta-oe/recipes-devtools/python/python-numpy/aarch64.patch > @@ -0,0 +1,41 @@ > +From 7d7a5939dcf5821d9f381d57bfa2012568ef6b82 Mon Sep 17 00:00:00 2001 > +From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> > +Date: Thu, 10 Jan 2013 21:49:01 +0100 > +Subject: [PATCH] Added support for AArch64 architecture > + > +Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> > + > +Upstream-status: backport Please use Upstream-Status: (with capital S) like most of patches. > +--- > + numpy/core/include/numpy/npy_cpu.h | 2 ++ > + numpy/core/include/numpy/npy_endian.h | 1 + > + 2 files changed, 3 insertions(+) > + > +diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h > +index 8a29788..9707a7a 100644 > +--- a/numpy/core/include/numpy/npy_cpu.h > ++++ b/numpy/core/include/numpy/npy_cpu.h > +@@ -66,6 +66,8 @@ > + #define NPY_CPU_MIPSEL > + #elif defined(__MIPSEB__) > + #define NPY_CPU_MIPSEB > ++#elif defined(__aarch64__) > ++ #define NPY_CPU_AARCH64 > + #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 aa5ed8b..4e3349f 100644 > +--- a/numpy/core/include/numpy/npy_endian.h > ++++ b/numpy/core/include/numpy/npy_endian.h > +@@ -25,6 +25,7 @@ > + || defined(NPY_CPU_IA64) \ > + || defined(NPY_CPU_ALPHA) \ > + || defined(NPY_CPU_ARMEL) \ > ++ || defined(NPY_CPU_AARCH64) \ > + || defined(NPY_CPU_SH_LE) \ > + || defined(NPY_CPU_MIPSEL) > + #define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN > +-- > +1.8.0 > + > diff --git a/meta-oe/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h b/meta-oe/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h > new file mode 100644 > index 0000000..be57ac2 > --- /dev/null > +++ b/meta-oe/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h > @@ -0,0 +1,30 @@ > +#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_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 0x00000007 > + > +#ifndef __STDC_FORMAT_MACROS > +#define __STDC_FORMAT_MACROS 1 > +#endif > diff --git a/meta-oe/recipes-devtools/python/python-numpy/aarch64/config.h b/meta-oe/recipes-devtools/python/python-numpy/aarch64/config.h > new file mode 100644 > index 0000000..c30b868 > --- /dev/null > +++ b/meta-oe/recipes-devtools/python/python-numpy/aarch64/config.h > @@ -0,0 +1,139 @@ > +#define HAVE_ENDIAN_H 1 > +#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-oe/recipes-devtools/python/python-numpy_1.4.1.bb b/meta-oe/recipes-devtools/python/python-numpy_1.7.0.bb > similarity index 50% > rename from meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb > rename to meta-oe/recipes-devtools/python/python-numpy_1.7.0.bb > index 2bede09..2e4bd6a 100644 > --- a/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb > +++ b/meta-oe/recipes-devtools/python/python-numpy_1.7.0.bb > @@ -1,14 +1,20 @@ > DESCRIPTION = "A sophisticated Numeric Processing Package for Python" > SECTION = "devel/python" > LICENSE = "PSF" > -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3c42211d73c3faa1026e671dd39883fa" > -PR = "r5" > +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f87832d854acbade6e9f5c601c8b30b1" > +PR = "r0" > +PV = "1.6.99+1.7.0rc1" > +REALPV = "1.7.0rc1" > > -SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \ > +SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${REALPV}.tar.gz \ > ${CONFIGFILESURI} \ > + file://aarch64.patch \ > " > CONFIGFILESURI ?= "" > > +CONFIGFILESURI_aarch64 = "file://config.h \ > + file://_numpyconfig.h \ > + " > CONFIGFILESURI_arm = "file://config.h \ > file://numpyconfig.h \ > " > @@ -16,7 +22,7 @@ CONFIGFILESURI_mipsel = "file://config.h \ > file://numpyconfig.h \ > " > > -S = "${WORKDIR}/numpy-${PV}" > +S = "${WORKDIR}/numpy-${REALPV}" > > inherit distutils > > @@ -29,14 +35,27 @@ do_compile_prepend() { > cp ${WORKDIR}/*config.h ${S}/build/$(ls ${S}/build | grep src)/numpy/core/include/numpy/ > } > > -SRC_URI[md5sum] = "5c7b5349dc3161763f7f366ceb96516b" > -SRC_URI[sha256sum] = "2e7bb84573e5123e07f3c919fd433bc09b78d606252b6b719e385c2a981d8e06" > - > FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a" > +SRC_URI[md5sum] = "a4719f5a1853bc0f8892a5956d5c4229" > +SRC_URI[sha256sum] = "45ea23622f72d86bc3614446d668ee962c0475ee7b91a93ef85a5e0493962de5" > > +# install what is needed for numpy.test() > RDEPENDS_${PN} = "python-unittest \ > python-difflib \ > python-pprint \ > python-pickle \ > python-shell \ > + python-nose \ > + python-doctest \ > + python-datetime \ > + python-distutils \ > + python-misc \ > + python-mmap \ > + python-netclient \ > + python-numbers \ > + python-pydoc \ > + python-pkgutil \ > + python-email \ > + python-subprocess \ > + python-compression \ > " > -- > 1.8.0 > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* [meta-oe][PATCH] python-numpy: add 1.7.0rc1 2013-01-30 10:45 ` Martin Jansa @ 2013-02-05 8:58 ` Marcin Juszkiewicz 2013-02-05 10:17 ` Martin Jansa 0 siblings, 1 reply; 5+ messages in thread From: Marcin Juszkiewicz @ 2013-02-05 8:58 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> --- .../python/python-numpy/aarch64.patch | 41 ++++++ .../python/python-numpy/aarch64/_numpyconfig.h | 30 +++++ .../python/python-numpy/aarch64/config.h | 139 +++++++++++++++++++++ ...hon-numpy_1.4.1.bb => python-numpy_1.7.0rc1.bb} | 33 +++-- 4 files changed, 236 insertions(+), 7 deletions(-) create mode 100644 meta-oe/recipes-devtools/python/python-numpy/aarch64.patch create mode 100644 meta-oe/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h create mode 100644 meta-oe/recipes-devtools/python/python-numpy/aarch64/config.h rename meta-oe/recipes-devtools/python/{python-numpy_1.4.1.bb => python-numpy_1.7.0rc1.bb} (50%) diff --git a/meta-oe/recipes-devtools/python/python-numpy/aarch64.patch b/meta-oe/recipes-devtools/python/python-numpy/aarch64.patch new file mode 100644 index 0000000..8d66615 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-numpy/aarch64.patch @@ -0,0 +1,41 @@ +From 7d7a5939dcf5821d9f381d57bfa2012568ef6b82 Mon Sep 17 00:00:00 2001 +From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> +Date: Thu, 10 Jan 2013 21:49:01 +0100 +Subject: [PATCH] Added support for AArch64 architecture + +Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> + +Upstream-Status: backport +--- + numpy/core/include/numpy/npy_cpu.h | 2 ++ + numpy/core/include/numpy/npy_endian.h | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h +index 8a29788..9707a7a 100644 +--- a/numpy/core/include/numpy/npy_cpu.h ++++ b/numpy/core/include/numpy/npy_cpu.h +@@ -66,6 +66,8 @@ + #define NPY_CPU_MIPSEL + #elif defined(__MIPSEB__) + #define NPY_CPU_MIPSEB ++#elif defined(__aarch64__) ++ #define NPY_CPU_AARCH64 + #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 aa5ed8b..4e3349f 100644 +--- a/numpy/core/include/numpy/npy_endian.h ++++ b/numpy/core/include/numpy/npy_endian.h +@@ -25,6 +25,7 @@ + || defined(NPY_CPU_IA64) \ + || defined(NPY_CPU_ALPHA) \ + || defined(NPY_CPU_ARMEL) \ ++ || defined(NPY_CPU_AARCH64) \ + || defined(NPY_CPU_SH_LE) \ + || defined(NPY_CPU_MIPSEL) + #define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN +-- +1.8.0 + diff --git a/meta-oe/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h b/meta-oe/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h new file mode 100644 index 0000000..be57ac2 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h @@ -0,0 +1,30 @@ +#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_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 0x00000007 + +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS 1 +#endif diff --git a/meta-oe/recipes-devtools/python/python-numpy/aarch64/config.h b/meta-oe/recipes-devtools/python/python-numpy/aarch64/config.h new file mode 100644 index 0000000..c30b868 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-numpy/aarch64/config.h @@ -0,0 +1,139 @@ +#define HAVE_ENDIAN_H 1 +#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-oe/recipes-devtools/python/python-numpy_1.4.1.bb b/meta-oe/recipes-devtools/python/python-numpy_1.7.0rc1.bb similarity index 50% rename from meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb rename to meta-oe/recipes-devtools/python/python-numpy_1.7.0rc1.bb index 2bede09..2e4bd6a 100644 --- a/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb +++ b/meta-oe/recipes-devtools/python/python-numpy_1.7.0rc1.bb @@ -1,14 +1,20 @@ DESCRIPTION = "A sophisticated Numeric Processing Package for Python" SECTION = "devel/python" LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3c42211d73c3faa1026e671dd39883fa" -PR = "r5" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f87832d854acbade6e9f5c601c8b30b1" +PR = "r0" +PV = "1.6.99+1.7.0rc1" +REALPV = "1.7.0rc1" -SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \ +SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${REALPV}.tar.gz \ ${CONFIGFILESURI} \ + file://aarch64.patch \ " CONFIGFILESURI ?= "" +CONFIGFILESURI_aarch64 = "file://config.h \ + file://_numpyconfig.h \ + " CONFIGFILESURI_arm = "file://config.h \ file://numpyconfig.h \ " @@ -16,7 +22,7 @@ CONFIGFILESURI_mipsel = "file://config.h \ file://numpyconfig.h \ " -S = "${WORKDIR}/numpy-${PV}" +S = "${WORKDIR}/numpy-${REALPV}" inherit distutils @@ -29,14 +35,27 @@ do_compile_prepend() { cp ${WORKDIR}/*config.h ${S}/build/$(ls ${S}/build | grep src)/numpy/core/include/numpy/ } -SRC_URI[md5sum] = "5c7b5349dc3161763f7f366ceb96516b" -SRC_URI[sha256sum] = "2e7bb84573e5123e07f3c919fd433bc09b78d606252b6b719e385c2a981d8e06" - FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a" +SRC_URI[md5sum] = "a4719f5a1853bc0f8892a5956d5c4229" +SRC_URI[sha256sum] = "45ea23622f72d86bc3614446d668ee962c0475ee7b91a93ef85a5e0493962de5" +# install what is needed for numpy.test() RDEPENDS_${PN} = "python-unittest \ python-difflib \ python-pprint \ python-pickle \ python-shell \ + python-nose \ + python-doctest \ + python-datetime \ + python-distutils \ + python-misc \ + python-mmap \ + python-netclient \ + python-numbers \ + python-pydoc \ + python-pkgutil \ + python-email \ + python-subprocess \ + python-compression \ " -- 1.8.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH] python-numpy: add 1.7.0rc1 2013-02-05 8:58 ` [meta-oe][PATCH] python-numpy: add 1.7.0rc1 Marcin Juszkiewicz @ 2013-02-05 10:17 ` Martin Jansa 0 siblings, 0 replies; 5+ messages in thread From: Martin Jansa @ 2013-02-05 10:17 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 11091 bytes --] On Tue, Feb 05, 2013 at 09:58:50AM +0100, Marcin Juszkiewicz wrote: > Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> > --- > .../python/python-numpy/aarch64.patch | 41 ++++++ > .../python/python-numpy/aarch64/_numpyconfig.h | 30 +++++ > .../python/python-numpy/aarch64/config.h | 139 +++++++++++++++++++++ > ...hon-numpy_1.4.1.bb => python-numpy_1.7.0rc1.bb} | 33 +++-- > 4 files changed, 236 insertions(+), 7 deletions(-) > create mode 100644 meta-oe/recipes-devtools/python/python-numpy/aarch64.patch > create mode 100644 meta-oe/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h > create mode 100644 meta-oe/recipes-devtools/python/python-numpy/aarch64/config.h > rename meta-oe/recipes-devtools/python/{python-numpy_1.4.1.bb => python-numpy_1.7.0rc1.bb} (50%) Merged, thanks > diff --git a/meta-oe/recipes-devtools/python/python-numpy/aarch64.patch b/meta-oe/recipes-devtools/python/python-numpy/aarch64.patch > new file mode 100644 > index 0000000..8d66615 > --- /dev/null > +++ b/meta-oe/recipes-devtools/python/python-numpy/aarch64.patch > @@ -0,0 +1,41 @@ > +From 7d7a5939dcf5821d9f381d57bfa2012568ef6b82 Mon Sep 17 00:00:00 2001 > +From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> > +Date: Thu, 10 Jan 2013 21:49:01 +0100 > +Subject: [PATCH] Added support for AArch64 architecture > + > +Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> > + > +Upstream-Status: backport > +--- > + numpy/core/include/numpy/npy_cpu.h | 2 ++ > + numpy/core/include/numpy/npy_endian.h | 1 + > + 2 files changed, 3 insertions(+) > + > +diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h > +index 8a29788..9707a7a 100644 > +--- a/numpy/core/include/numpy/npy_cpu.h > ++++ b/numpy/core/include/numpy/npy_cpu.h > +@@ -66,6 +66,8 @@ > + #define NPY_CPU_MIPSEL > + #elif defined(__MIPSEB__) > + #define NPY_CPU_MIPSEB > ++#elif defined(__aarch64__) > ++ #define NPY_CPU_AARCH64 > + #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 aa5ed8b..4e3349f 100644 > +--- a/numpy/core/include/numpy/npy_endian.h > ++++ b/numpy/core/include/numpy/npy_endian.h > +@@ -25,6 +25,7 @@ > + || defined(NPY_CPU_IA64) \ > + || defined(NPY_CPU_ALPHA) \ > + || defined(NPY_CPU_ARMEL) \ > ++ || defined(NPY_CPU_AARCH64) \ > + || defined(NPY_CPU_SH_LE) \ > + || defined(NPY_CPU_MIPSEL) > + #define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN > +-- > +1.8.0 > + > diff --git a/meta-oe/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h b/meta-oe/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h > new file mode 100644 > index 0000000..be57ac2 > --- /dev/null > +++ b/meta-oe/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h > @@ -0,0 +1,30 @@ > +#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_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 0x00000007 > + > +#ifndef __STDC_FORMAT_MACROS > +#define __STDC_FORMAT_MACROS 1 > +#endif > diff --git a/meta-oe/recipes-devtools/python/python-numpy/aarch64/config.h b/meta-oe/recipes-devtools/python/python-numpy/aarch64/config.h > new file mode 100644 > index 0000000..c30b868 > --- /dev/null > +++ b/meta-oe/recipes-devtools/python/python-numpy/aarch64/config.h > @@ -0,0 +1,139 @@ > +#define HAVE_ENDIAN_H 1 > +#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-oe/recipes-devtools/python/python-numpy_1.4.1.bb b/meta-oe/recipes-devtools/python/python-numpy_1.7.0rc1.bb > similarity index 50% > rename from meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb > rename to meta-oe/recipes-devtools/python/python-numpy_1.7.0rc1.bb > index 2bede09..2e4bd6a 100644 > --- a/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb > +++ b/meta-oe/recipes-devtools/python/python-numpy_1.7.0rc1.bb > @@ -1,14 +1,20 @@ > DESCRIPTION = "A sophisticated Numeric Processing Package for Python" > SECTION = "devel/python" > LICENSE = "PSF" > -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3c42211d73c3faa1026e671dd39883fa" > -PR = "r5" > +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f87832d854acbade6e9f5c601c8b30b1" > +PR = "r0" > +PV = "1.6.99+1.7.0rc1" > +REALPV = "1.7.0rc1" > > -SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \ > +SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${REALPV}.tar.gz \ > ${CONFIGFILESURI} \ > + file://aarch64.patch \ > " > CONFIGFILESURI ?= "" > > +CONFIGFILESURI_aarch64 = "file://config.h \ > + file://_numpyconfig.h \ > + " > CONFIGFILESURI_arm = "file://config.h \ > file://numpyconfig.h \ > " > @@ -16,7 +22,7 @@ CONFIGFILESURI_mipsel = "file://config.h \ > file://numpyconfig.h \ > " > > -S = "${WORKDIR}/numpy-${PV}" > +S = "${WORKDIR}/numpy-${REALPV}" > > inherit distutils > > @@ -29,14 +35,27 @@ do_compile_prepend() { > cp ${WORKDIR}/*config.h ${S}/build/$(ls ${S}/build | grep src)/numpy/core/include/numpy/ > } > > -SRC_URI[md5sum] = "5c7b5349dc3161763f7f366ceb96516b" > -SRC_URI[sha256sum] = "2e7bb84573e5123e07f3c919fd433bc09b78d606252b6b719e385c2a981d8e06" > - > FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a" > +SRC_URI[md5sum] = "a4719f5a1853bc0f8892a5956d5c4229" > +SRC_URI[sha256sum] = "45ea23622f72d86bc3614446d668ee962c0475ee7b91a93ef85a5e0493962de5" > > +# install what is needed for numpy.test() > RDEPENDS_${PN} = "python-unittest \ > python-difflib \ > python-pprint \ > python-pickle \ > python-shell \ > + python-nose \ > + python-doctest \ > + python-datetime \ > + python-distutils \ > + python-misc \ > + python-mmap \ > + python-netclient \ > + python-numbers \ > + python-pydoc \ > + python-pkgutil \ > + python-email \ > + python-subprocess \ > + python-compression \ > " > -- > 1.8.0 > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-02-05 10:33 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-01-30 7:50 [meta-oe][PATCH 1/2] python-nose: add 1.2.1 Marcin Juszkiewicz 2013-01-30 7:50 ` [meta-oe][PATCH 2/2] python-numpy: add 1.7.0-rc1 Marcin Juszkiewicz 2013-01-30 10:45 ` Martin Jansa 2013-02-05 8:58 ` [meta-oe][PATCH] python-numpy: add 1.7.0rc1 Marcin Juszkiewicz 2013-02-05 10:17 ` Martin Jansa
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.