python-numpy: use x86 over-ride instead of i586

Support i686 without needing to duplicate the i586 over-ride.

(From OE-Core rev: 9206887e7e3c1763438ea2abe2da807d2a61d59a)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 24 insertions, 0 deletions

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