From: Andre McCurdy <armccurdy@gmail.com>
Date: Thu, 4 Jun 2015 19:24:46 +0000 (-0700)
Subject: python-numpy: use x86 over-ride instead of i586
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f3b403a1c6a7d61b5e34441a4c17c9fe2f7bb4e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/meta/recipes-devtools/python/python-numpy/i586/config.h b/meta/recipes-devtools/python/python-numpy/x86/config.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/i586/config.h
rename to meta/recipes-devtools/python/python-numpy/x86/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/i586/numpyconfig.h b/meta/recipes-devtools/python/python-numpy/x86/numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/i586/numpyconfig.h
rename to meta/recipes-devtools/python/python-numpy/x86/numpyconfig.h
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 d4fd2792302..81cdfde2b1a 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 \
 "