[PATCH 1/4] python-numpy: use x86 over-ride instead of i586

[PATCH 1/4] python-numpy: use x86 over-ride instead of i586

[Andre McCurdy]

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

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/recipes-devtools/python/python-numpy/{i586 => x86}/config.h      | 0
 meta/recipes-devtools/python/python-numpy/{i586 => x86}/numpyconfig.h | 0
 meta/recipes-devtools/python/python-numpy_1.7.0.bb                    | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/python-numpy/{i586 => x86}/config.h (100%)
 rename meta/recipes-devtools/python/python-numpy/{i586 => x86}/numpyconfig.h (100%)

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 d4fd279..81cdfde 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 \
 "
-- 
1.9.1

[PATCH 2/4] gstreamer1.0-plugins-base.inc: use x86 over-ride instead of i586

[Andre McCurdy]

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

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
index 06eac67..97e2949 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
@@ -37,4 +37,4 @@ EXTRA_OECONF += " \
 
 FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict"
 
-CACHED_CONFIGUREVARS_append_i586 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"
+CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"
-- 
1.9.1

[PATCH 3/4] lame: use x86 over-ride instead of i586

[Andre McCurdy]

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

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/recipes-multimedia/lame/lame_3.99.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/lame/lame_3.99.5.bb b/meta/recipes-multimedia/lame/lame_3.99.5.bb
index d0e8872..0477611 100644
--- a/meta/recipes-multimedia/lame/lame_3.99.5.bb
+++ b/meta/recipes-multimedia/lame/lame_3.99.5.bb
@@ -27,4 +27,4 @@ FILES_libmp3lame = "${libdir}/libmp3lame.so.*"
 FILES_libmp3lame-dev = "${includedir} ${libdir}/*"
 FILES_${PN}-dev = ""
 
-CACHED_CONFIGUREVARS_append_i586 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"
+CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"
-- 
1.9.1

[PATCH 4/4] x264: use x86 over-ride instead of i586

[Andre McCurdy]

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

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/recipes-multimedia/x264/x264_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb
index 0e856b3..105ccae 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -51,5 +51,5 @@ do_install() {
 }
 
 # PIC can't be enabled for 32-bit x86
-INSANE_SKIP_${PN}_append_i586 = " textrel"
+INSANE_SKIP_${PN}_append_x86 = " textrel"
 
-- 
1.9.1