summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-12 18:00:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-15 23:27:41 +0100
commite273301efa0037a13c3a60b4414140364d9c9873 (patch)
treec192a1d3d818bd262604531137f0c34e79232c51
parent66daa92582a5a5643fd2e45aace1f5c009b2ded3 (diff)
downloadopenembedded-core-contrib-e273301efa0037a13c3a60b4414140364d9c9873.tar.gz
openembedded-core-contrib-e273301efa0037a13c3a60b4414140364d9c9873.tar.bz2
openembedded-core-contrib-e273301efa0037a13c3a60b4414140364d9c9873.zip
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@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc1
-rw-r--r--meta/recipes-multimedia/lame/lame_3.99.5.bb2
3 files changed, 5 insertions, 0 deletions
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 83b856b110..4a8a9947a7 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 eb132775c6..972ff18160 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 907ff8f9d0..695b7ca989 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"