[oe-commits] Richard Purdie : gstreamer/lame: Better gcc 4.9 fix

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: e273301efa0037a13c3a60b4414140364d9c9873
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e273301efa0037a13c3a60b4414140364d9c9873

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Mon May 12 18:00:03 2014 +0100

gstreamer/lame: Better gcc 4.9 fix

gstreamer/lame does runtime detection to enable/disable things like SSE code.
Unfortunately it is broken and will try and use this even with i586
compiler flags. This change forces it back to the approach with gcc 4.8
by disabling the problematic headers.

Its suboptimal but less so that the proposed previous forced enabling of
SSE on x86 everywhere.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb   | 2 ++
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc | 1 +
 meta/recipes-multimedia/lame/lame_3.99.5.bb                     | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
index 83b856b..4a8a994 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
@@ -33,3 +33,5 @@ do_configure_prepend() {
 }
 
 FILES_${PN} += "${datadir}/${BPN}"
+
+CACHED_CONFIGUREVARS_append_i586 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
index eb13277..972ff18 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
@@ -37,3 +37,4 @@ EXTRA_OECONF += " \
 
 FILES_${PN} += "${datadir}/gst-plugins-base"
 
+CACHED_CONFIGUREVARS_append_i586 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"
diff --git a/meta/recipes-multimedia/lame/lame_3.99.5.bb b/meta/recipes-multimedia/lame/lame_3.99.5.bb
index 907ff8f..695b7ca 100644
--- a/meta/recipes-multimedia/lame/lame_3.99.5.bb
+++ b/meta/recipes-multimedia/lame/lame_3.99.5.bb
@@ -26,3 +26,5 @@ FILES_${PN} = "${bindir}/lame"
 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"