From 9206887e7e3c1763438ea2abe2da807d2a61d59a Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Thu, 4 Jun 2015 12:24:46 -0700 Subject: python-numpy: use x86 over-ride instead of i586 Support i686 without needing to duplicate the i586 over-ride. Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton --- .../python/python-numpy/i586/config.h | 108 --------------------- .../python/python-numpy/i586/numpyconfig.h | 24 ----- .../python/python-numpy/x86/config.h | 108 +++++++++++++++++++++ .../python/python-numpy/x86/numpyconfig.h | 24 +++++ meta/recipes-devtools/python/python-numpy_1.7.0.bb | 2 +- 5 files changed, 133 insertions(+), 133 deletions(-) delete mode 100644 meta/recipes-devtools/python/python-numpy/i586/config.h delete mode 100644 meta/recipes-devtools/python/python-numpy/i586/numpyconfig.h create mode 100644 meta/recipes-devtools/python/python-numpy/x86/config.h create mode 100644 meta/recipes-devtools/python/python-numpy/x86/numpyconfig.h diff --git a/meta/recipes-devtools/python/python-numpy/i586/config.h b/meta/recipes-devtools/python/python-numpy/i586/config.h deleted file mode 100644 index 08e41e3d99..0000000000 --- a/meta/recipes-devtools/python/python-numpy/i586/config.h +++ /dev/null @@ -1,108 +0,0 @@ -#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/recipes-devtools/python/python-numpy/i586/numpyconfig.h b/meta/recipes-devtools/python/python-numpy/i586/numpyconfig.h deleted file mode 100644 index ff7938cd96..0000000000 --- a/meta/recipes-devtools/python/python-numpy/i586/numpyconfig.h +++ /dev/null @@ -1,24 +0,0 @@ -#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/recipes-devtools/python/python-numpy/x86/config.h b/meta/recipes-devtools/python/python-numpy/x86/config.h new file mode 100644 index 0000000000..08e41e3d99 --- /dev/null +++ b/meta/recipes-devtools/python/python-numpy/x86/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/recipes-devtools/python/python-numpy/x86/numpyconfig.h b/meta/recipes-devtools/python/python-numpy/x86/numpyconfig.h new file mode 100644 index 0000000000..ff7938cd96 --- /dev/null +++ b/meta/recipes-devtools/python/python-numpy/x86/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/recipes-devtools/python/python-numpy_1.7.0.bb b/meta/recipes-devtools/python/python-numpy_1.7.0.bb index d4fd279230..81cdfde2b1 100644 --- a/meta/recipes-devtools/python/python-numpy_1.7.0.bb +++ b/meta/recipes-devtools/python/python-numpy_1.7.0.bb @@ -26,7 +26,7 @@ CONFIGFILESURI_mipsel = " \ file://config.h \ file://numpyconfig.h \ " -CONFIGFILESURI_i586 = " \ +CONFIGFILESURI_x86 = " \ file://config.h \ file://numpyconfig.h \ " -- cgit 1.2.3-korg