Patchwork [1/1,meta-oe] python-numpy: add config files for armeb architecture

login
register
mail settings
Submitter Fathi Boudra
Date Oct. 11, 2013, 8:09 a.m.
Message ID <1381478940-18836-1-git-send-email-fathi.boudra@linaro.org>
Download mbox | patch
Permalink /patch/59637/
State Accepted, archived
Commit 9fede488dc6f1320f6000be93953a887ade52eb7
Headers show

Comments

Fathi Boudra - Oct. 11, 2013, 8:09 a.m.
Fix python-numpy build failure on armeb architecture.

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
---
 .../python/python-numpy/armeb/config.h              | 21 +++++++++++++++++++++
 .../python/python-numpy/armeb/numpyconfig.h         | 17 +++++++++++++++++
 .../recipes-devtools/python/python-numpy_1.7.0.bb   |  5 +++++
 3 files changed, 43 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/python/python-numpy/armeb/config.h
 create mode 100644 meta-oe/recipes-devtools/python/python-numpy/armeb/numpyconfig.h
Koen Kooi - Oct. 11, 2013, 9:16 a.m.
Op 11 okt. 2013, om 10:09 heeft Fathi Boudra <fathi.boudra@linaro.org> het volgende geschreven:

> Fix python-numpy build failure on armeb architecture.
> 
> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

Acked-by: Koen Kooi <koen.kooi@linaro.org>

> ---
> .../python/python-numpy/armeb/config.h              | 21 +++++++++++++++++++++
> .../python/python-numpy/armeb/numpyconfig.h         | 17 +++++++++++++++++
> .../recipes-devtools/python/python-numpy_1.7.0.bb   |  5 +++++
> 3 files changed, 43 insertions(+)
> create mode 100644 meta-oe/recipes-devtools/python/python-numpy/armeb/config.h
> create mode 100644 meta-oe/recipes-devtools/python/python-numpy/armeb/numpyconfig.h
> 
> diff --git a/meta-oe/recipes-devtools/python/python-numpy/armeb/config.h b/meta-oe/recipes-devtools/python/python-numpy/armeb/config.h
> new file mode 100644
> index 0000000..17ef186
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/python/python-numpy/armeb/config.h
> @@ -0,0 +1,21 @@
> +/* ./src.linux-i686-2.5/numpy/core/include/numpy/config.h */
> +/* #define SIZEOF_SHORT 2 */
> +/* #define SIZEOF_INT 4 */
> +/* #define SIZEOF_LONG 4 */
> +/* #define SIZEOF_FLOAT 4 */
> +/* #define SIZEOF_DOUBLE 8 */
> +#define SIZEOF_LONG_DOUBLE 12
> +#define SIZEOF_PY_INTPTR_T 4
> +/* #define SIZEOF_LONG_LONG 8 */
> +#define SIZEOF_PY_LONG_LONG 8
> +/* #define CHAR_BIT 8 */
> +#define MATHLIB m
> +#define HAVE_FLOAT_FUNCS
> +#define HAVE_LOG1P
> +#define HAVE_EXPM1
> +#define HAVE_INVERSE_HYPERBOLIC
> +#define HAVE_INVERSE_HYPERBOLIC_FLOAT
> +#define HAVE_ISNAN
> +#define HAVE_ISINF
> +#define HAVE_RINT
> +
> diff --git a/meta-oe/recipes-devtools/python/python-numpy/armeb/numpyconfig.h b/meta-oe/recipes-devtools/python/python-numpy/armeb/numpyconfig.h
> new file mode 100644
> index 0000000..c4bf654
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/python/python-numpy/armeb/numpyconfig.h
> @@ -0,0 +1,17 @@
> +/* cat ./src.linux-i686-2.5/numpy/core/include/numpy/numpyconfig.h */
> +/*
> + *  * This file is generated by numpy/core/setup.pyc. DO NOT EDIT 
> + *   */
> +#define NPY_SIZEOF_SHORT 2 
> +#define NPY_SIZEOF_INT 4 
> +#define NPY_SIZEOF_LONG 4 
> +#define NPY_SIZEOF_FLOAT 4 
> +#define NPY_SIZEOF_DOUBLE 8 
> +#define NPY_SIZEOF_LONGDOUBLE 12 
> +#define NPY_SIZEOF_PY_INTPTR_T 4 
> +#define NPY_NO_SMP 0
> +
> +#define NPY_SIZEOF_LONGLONG 8 
> +#define NPY_SIZEOF_PY_LONG_LONG 8 
> +/* #define CHAR_BIT 8 */
> +
> diff --git a/meta-oe/recipes-devtools/python/python-numpy_1.7.0.bb b/meta-oe/recipes-devtools/python/python-numpy_1.7.0.bb
> index 7d2f2e2..e6d328f 100644
> --- a/meta-oe/recipes-devtools/python/python-numpy_1.7.0.bb
> +++ b/meta-oe/recipes-devtools/python/python-numpy_1.7.0.bb
> @@ -2,6 +2,7 @@ DESCRIPTION = "A sophisticated Numeric Processing Package for Python"
> SECTION = "devel/python"
> LICENSE = "PSF"
> LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f87832d854acbade6e9f5c601c8b30b1"
> +PR = "r1"
> 
> SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \
>            ${CONFIGFILESURI} "
> @@ -16,6 +17,10 @@ CONFIGFILESURI_arm = " \
>     file://config.h \
>     file://numpyconfig.h \
> "
> +CONFIGFILESURI_armeb = " \
> +    file://config.h \
> +    file://numpyconfig.h \
> +"
> CONFIGFILESURI_mipsel = " \
>     file://config.h \
>     file://numpyconfig.h \
> -- 
> 1.8.1.2
>

Patch

diff --git a/meta-oe/recipes-devtools/python/python-numpy/armeb/config.h b/meta-oe/recipes-devtools/python/python-numpy/armeb/config.h
new file mode 100644
index 0000000..17ef186
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-numpy/armeb/config.h
@@ -0,0 +1,21 @@ 
+/* ./src.linux-i686-2.5/numpy/core/include/numpy/config.h */
+/* #define SIZEOF_SHORT 2 */
+/* #define SIZEOF_INT 4 */
+/* #define SIZEOF_LONG 4 */
+/* #define SIZEOF_FLOAT 4 */
+/* #define SIZEOF_DOUBLE 8 */
+#define SIZEOF_LONG_DOUBLE 12
+#define SIZEOF_PY_INTPTR_T 4
+/* #define SIZEOF_LONG_LONG 8 */
+#define SIZEOF_PY_LONG_LONG 8
+/* #define CHAR_BIT 8 */
+#define MATHLIB m
+#define HAVE_FLOAT_FUNCS
+#define HAVE_LOG1P
+#define HAVE_EXPM1
+#define HAVE_INVERSE_HYPERBOLIC
+#define HAVE_INVERSE_HYPERBOLIC_FLOAT
+#define HAVE_ISNAN
+#define HAVE_ISINF
+#define HAVE_RINT
+
diff --git a/meta-oe/recipes-devtools/python/python-numpy/armeb/numpyconfig.h b/meta-oe/recipes-devtools/python/python-numpy/armeb/numpyconfig.h
new file mode 100644
index 0000000..c4bf654
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-numpy/armeb/numpyconfig.h
@@ -0,0 +1,17 @@ 
+/* cat ./src.linux-i686-2.5/numpy/core/include/numpy/numpyconfig.h */
+/*
+ *  * This file is generated by numpy/core/setup.pyc. DO NOT EDIT 
+ *   */
+#define NPY_SIZEOF_SHORT 2 
+#define NPY_SIZEOF_INT 4 
+#define NPY_SIZEOF_LONG 4 
+#define NPY_SIZEOF_FLOAT 4 
+#define NPY_SIZEOF_DOUBLE 8 
+#define NPY_SIZEOF_LONGDOUBLE 12 
+#define NPY_SIZEOF_PY_INTPTR_T 4 
+#define NPY_NO_SMP 0
+
+#define NPY_SIZEOF_LONGLONG 8 
+#define NPY_SIZEOF_PY_LONG_LONG 8 
+/* #define CHAR_BIT 8 */
+
diff --git a/meta-oe/recipes-devtools/python/python-numpy_1.7.0.bb b/meta-oe/recipes-devtools/python/python-numpy_1.7.0.bb
index 7d2f2e2..e6d328f 100644
--- a/meta-oe/recipes-devtools/python/python-numpy_1.7.0.bb
+++ b/meta-oe/recipes-devtools/python/python-numpy_1.7.0.bb
@@ -2,6 +2,7 @@  DESCRIPTION = "A sophisticated Numeric Processing Package for Python"
 SECTION = "devel/python"
 LICENSE = "PSF"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f87832d854acbade6e9f5c601c8b30b1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \
            ${CONFIGFILESURI} "
@@ -16,6 +17,10 @@  CONFIGFILESURI_arm = " \
     file://config.h \
     file://numpyconfig.h \
 "
+CONFIGFILESURI_armeb = " \
+    file://config.h \
+    file://numpyconfig.h \
+"
 CONFIGFILESURI_mipsel = " \
     file://config.h \
     file://numpyconfig.h \