Patchwork [meta-oe] python-numpy: add i586 *config.h files

login
register
mail settings
Submitter Koen Kooi
Date March 16, 2013, 1:15 p.m.
Message ID <1363439755-13680-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/46273/
State Accepted
Commit 1b1008f319966c1d4c4a6baffe4544e839462dce
Headers show

Comments

Koen Kooi - March 16, 2013, 1:15 p.m.
Generated using native compile on FRI2/angstrom

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 .../python/python-numpy/i586/config.h              | 108 +++++++++++++++++++++
 .../python/python-numpy/i586/numpyconfig.h         |  24 +++++
 .../recipes-devtools/python/python-numpy_1.7.0.bb  |   4 +
 3 files changed, 136 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/python/python-numpy/i586/config.h
 create mode 100644 meta-oe/recipes-devtools/python/python-numpy/i586/numpyconfig.h
Martin Jansa - March 22, 2013, 9:23 a.m.
On Sat, Mar 16, 2013 at 02:15:55PM +0100, Koen Kooi wrote:
> Generated using native compile on FRI2/angstrom

Applied, thanks!

> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  .../python/python-numpy/i586/config.h              | 108 +++++++++++++++++++++
>  .../python/python-numpy/i586/numpyconfig.h         |  24 +++++
>  .../recipes-devtools/python/python-numpy_1.7.0.bb  |   4 +
>  3 files changed, 136 insertions(+)
>  create mode 100644 meta-oe/recipes-devtools/python/python-numpy/i586/config.h
>  create mode 100644 meta-oe/recipes-devtools/python/python-numpy/i586/numpyconfig.h
> 
> diff --git a/meta-oe/recipes-devtools/python/python-numpy/i586/config.h b/meta-oe/recipes-devtools/python/python-numpy/i586/config.h
> new file mode 100644
> index 0000000..08e41e3
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/python/python-numpy/i586/config.h
> @@ -0,0 +1,108 @@
> +#define SIZEOF_PY_INTPTR_T 4
> +#define SIZEOF_PY_LONG_LONG 8
> +#define MATHLIB m
> +#define HAVE_SIN
> +#define HAVE_COS
> +#define HAVE_TAN
> +#define HAVE_SINH
> +#define HAVE_COSH
> +#define HAVE_TANH
> +#define HAVE_FABS
> +#define HAVE_FLOOR
> +#define HAVE_CEIL
> +#define HAVE_SQRT
> +#define HAVE_LOG10
> +#define HAVE_LOG
> +#define HAVE_EXP
> +#define HAVE_ASIN
> +#define HAVE_ACOS
> +#define HAVE_ATAN
> +#define HAVE_FMOD
> +#define HAVE_MODF
> +#define HAVE_FREXP
> +#define HAVE_LDEXP
> +#define HAVE_RINT
> +#define HAVE_TRUNC
> +#define HAVE_EXP2
> +#define HAVE_LOG2
> +#define HAVE_ATAN2
> +#define HAVE_POW
> +#define HAVE_NEXTAFTER
> +#define HAVE_SINF
> +#define HAVE_COSF
> +#define HAVE_TANF
> +#define HAVE_SINHF
> +#define HAVE_COSHF
> +#define HAVE_TANHF
> +#define HAVE_FABSF
> +#define HAVE_FLOORF
> +#define HAVE_CEILF
> +#define HAVE_RINTF
> +#define HAVE_TRUNCF
> +#define HAVE_SQRTF
> +#define HAVE_LOG10F
> +#define HAVE_LOGF
> +#define HAVE_LOG1PF
> +#define HAVE_EXPF
> +#define HAVE_EXPM1F
> +#define HAVE_ASINF
> +#define HAVE_ACOSF
> +#define HAVE_ATANF
> +#define HAVE_ASINHF
> +#define HAVE_ACOSHF
> +#define HAVE_ATANHF
> +#define HAVE_HYPOTF
> +#define HAVE_ATAN2F
> +#define HAVE_POWF
> +#define HAVE_FMODF
> +#define HAVE_MODFF
> +#define HAVE_FREXPF
> +#define HAVE_LDEXPF
> +#define HAVE_EXP2F
> +#define HAVE_LOG2F
> +#define HAVE_COPYSIGNF
> +#define HAVE_NEXTAFTERF
> +#define HAVE_SINL
> +#define HAVE_COSL
> +#define HAVE_TANL
> +#define HAVE_SINHL
> +#define HAVE_COSHL
> +#define HAVE_TANHL
> +#define HAVE_FABSL
> +#define HAVE_FLOORL
> +#define HAVE_CEILL
> +#define HAVE_RINTL
> +#define HAVE_TRUNCL
> +#define HAVE_SQRTL
> +#define HAVE_LOG10L
> +#define HAVE_LOGL
> +#define HAVE_LOG1PL
> +#define HAVE_EXPL
> +#define HAVE_EXPM1L
> +#define HAVE_ASINL
> +#define HAVE_ACOSL
> +#define HAVE_ATANL
> +#define HAVE_ASINHL
> +#define HAVE_ACOSHL
> +#define HAVE_ATANHL
> +#define HAVE_HYPOTL
> +#define HAVE_ATAN2L
> +#define HAVE_POWL
> +#define HAVE_FMODL
> +#define HAVE_MODFL
> +#define HAVE_FREXPL
> +#define HAVE_LDEXPL
> +#define HAVE_EXP2L
> +#define HAVE_LOG2L
> +#define HAVE_COPYSIGNL
> +#define HAVE_NEXTAFTERL
> +#define HAVE_DECL_SIGNBIT
> +#define HAVE_COMPLEX_H
> +#define HAVE_LDOUBLE_INTEL_EXTENDED_12_BYTES_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/i586/numpyconfig.h b/meta-oe/recipes-devtools/python/python-numpy/i586/numpyconfig.h
> new file mode 100644
> index 0000000..ff7938c
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/python/python-numpy/i586/numpyconfig.h
> @@ -0,0 +1,24 @@
> +#ifndef _NPY_NUMPYCONFIG_H_
> +#define _NPY_NUMPYCONFIG_H_
> +
> +#include "_numpyconfig.h"
> +
> +/* 
> + * On Mac OS X, because there is only one configuration stage for all the archs
> + * in universal builds, any macro which depends on the arch needs to be
> + * harcoded
> + */
> +#ifdef __APPLE__
> +	#undef NPY_SIZEOF_LONG
> +	#undef NPY_SIZEOF_PY_INTPTR_T
> +
> +	#ifdef __LP64__
> +		#define NPY_SIZEOF_LONG 		8
> +		#define NPY_SIZEOF_PY_INTPTR_T 	8
> +	#else
> +		#define NPY_SIZEOF_LONG 		4
> +		#define NPY_SIZEOF_PY_INTPTR_T 	4
> +	#endif
> +#endif
> +
> +#endif
> 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 bbe4e63..23bec15 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
> @@ -18,6 +18,10 @@ CONFIGFILESURI_mipsel = "file://config.h \
>  	   file://numpyconfig.h \
>  	  "
>  
> +CONFIGFILESURI_i586 = "file://config.h \
> +                       file://numpyconfig.h \
> +                      "
> +
>  S = "${WORKDIR}/numpy-${PV}"
>  
>  inherit distutils
> -- 
> 1.8.1.4
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-devtools/python/python-numpy/i586/config.h b/meta-oe/recipes-devtools/python/python-numpy/i586/config.h
new file mode 100644
index 0000000..08e41e3
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-numpy/i586/config.h
@@ -0,0 +1,108 @@ 
+#define SIZEOF_PY_INTPTR_T 4
+#define SIZEOF_PY_LONG_LONG 8
+#define MATHLIB m
+#define HAVE_SIN
+#define HAVE_COS
+#define HAVE_TAN
+#define HAVE_SINH
+#define HAVE_COSH
+#define HAVE_TANH
+#define HAVE_FABS
+#define HAVE_FLOOR
+#define HAVE_CEIL
+#define HAVE_SQRT
+#define HAVE_LOG10
+#define HAVE_LOG
+#define HAVE_EXP
+#define HAVE_ASIN
+#define HAVE_ACOS
+#define HAVE_ATAN
+#define HAVE_FMOD
+#define HAVE_MODF
+#define HAVE_FREXP
+#define HAVE_LDEXP
+#define HAVE_RINT
+#define HAVE_TRUNC
+#define HAVE_EXP2
+#define HAVE_LOG2
+#define HAVE_ATAN2
+#define HAVE_POW
+#define HAVE_NEXTAFTER
+#define HAVE_SINF
+#define HAVE_COSF
+#define HAVE_TANF
+#define HAVE_SINHF
+#define HAVE_COSHF
+#define HAVE_TANHF
+#define HAVE_FABSF
+#define HAVE_FLOORF
+#define HAVE_CEILF
+#define HAVE_RINTF
+#define HAVE_TRUNCF
+#define HAVE_SQRTF
+#define HAVE_LOG10F
+#define HAVE_LOGF
+#define HAVE_LOG1PF
+#define HAVE_EXPF
+#define HAVE_EXPM1F
+#define HAVE_ASINF
+#define HAVE_ACOSF
+#define HAVE_ATANF
+#define HAVE_ASINHF
+#define HAVE_ACOSHF
+#define HAVE_ATANHF
+#define HAVE_HYPOTF
+#define HAVE_ATAN2F
+#define HAVE_POWF
+#define HAVE_FMODF
+#define HAVE_MODFF
+#define HAVE_FREXPF
+#define HAVE_LDEXPF
+#define HAVE_EXP2F
+#define HAVE_LOG2F
+#define HAVE_COPYSIGNF
+#define HAVE_NEXTAFTERF
+#define HAVE_SINL
+#define HAVE_COSL
+#define HAVE_TANL
+#define HAVE_SINHL
+#define HAVE_COSHL
+#define HAVE_TANHL
+#define HAVE_FABSL
+#define HAVE_FLOORL
+#define HAVE_CEILL
+#define HAVE_RINTL
+#define HAVE_TRUNCL
+#define HAVE_SQRTL
+#define HAVE_LOG10L
+#define HAVE_LOGL
+#define HAVE_LOG1PL
+#define HAVE_EXPL
+#define HAVE_EXPM1L
+#define HAVE_ASINL
+#define HAVE_ACOSL
+#define HAVE_ATANL
+#define HAVE_ASINHL
+#define HAVE_ACOSHL
+#define HAVE_ATANHL
+#define HAVE_HYPOTL
+#define HAVE_ATAN2L
+#define HAVE_POWL
+#define HAVE_FMODL
+#define HAVE_MODFL
+#define HAVE_FREXPL
+#define HAVE_LDEXPL
+#define HAVE_EXP2L
+#define HAVE_LOG2L
+#define HAVE_COPYSIGNL
+#define HAVE_NEXTAFTERL
+#define HAVE_DECL_SIGNBIT
+#define HAVE_COMPLEX_H
+#define HAVE_LDOUBLE_INTEL_EXTENDED_12_BYTES_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/i586/numpyconfig.h b/meta-oe/recipes-devtools/python/python-numpy/i586/numpyconfig.h
new file mode 100644
index 0000000..ff7938c
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-numpy/i586/numpyconfig.h
@@ -0,0 +1,24 @@ 
+#ifndef _NPY_NUMPYCONFIG_H_
+#define _NPY_NUMPYCONFIG_H_
+
+#include "_numpyconfig.h"
+
+/* 
+ * On Mac OS X, because there is only one configuration stage for all the archs
+ * in universal builds, any macro which depends on the arch needs to be
+ * harcoded
+ */
+#ifdef __APPLE__
+	#undef NPY_SIZEOF_LONG
+	#undef NPY_SIZEOF_PY_INTPTR_T
+
+	#ifdef __LP64__
+		#define NPY_SIZEOF_LONG 		8
+		#define NPY_SIZEOF_PY_INTPTR_T 	8
+	#else
+		#define NPY_SIZEOF_LONG 		4
+		#define NPY_SIZEOF_PY_INTPTR_T 	4
+	#endif
+#endif
+
+#endif
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 bbe4e63..23bec15 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
@@ -18,6 +18,10 @@  CONFIGFILESURI_mipsel = "file://config.h \
 	   file://numpyconfig.h \
 	  "
 
+CONFIGFILESURI_i586 = "file://config.h \
+                       file://numpyconfig.h \
+                      "
+
 S = "${WORKDIR}/numpy-${PV}"
 
 inherit distutils