summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-09-05 21:56:04 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-05 22:41:19 +0100
commitd48b9f13af440bad37de6056649e4451d2c3a92a (patch)
tree3659ba9b47822d56a0d98d1da29193b979922cb5
parent02d9f0df0ddc9ed192b14e727fac30686af296fc (diff)
downloadopenembedded-core-contrib-d48b9f13af440bad37de6056649e4451d2c3a92a.tar.gz
openembedded-core-contrib-d48b9f13af440bad37de6056649e4451d2c3a92a.tar.bz2
openembedded-core-contrib-d48b9f13af440bad37de6056649e4451d2c3a92a.zip
gstreamer: do not attempt to run a plugin scanner during gtk-doc generation
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0.inc2
2 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
index e29a25f51c..5a61ca0ecc 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
@@ -40,8 +40,10 @@ delete_pkg_m4_file() {
patch_gtk_doc_makefiles() {
# Patch the gtk-doc makefiles so that the qemu wrapper is used to run transient binaries
# instead of libtool wrapper or running them directly
+ # Also substitute a bogus plugin scanner, as trying to run the real one is causing issues during build on x86_64.
sed -i \
-e "s|GTKDOC_RUN =.*|GTKDOC_RUN = \$(top_builddir)/gtkdoc-qemuwrapper|" \
+ -e "s|\$(GTKDOC_EXTRA_ENVIRONMENT)|\$(GTKDOC_EXTRA_ENVIRONMENT) GST_PLUGIN_SCANNER_1_0=\$(top_builddir)/libs/gst/helpers/gst-plugin-scanner-dummy|" \
${S}/common/gtk-doc*mak
}
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
index c8af53993e..e6bd2dd5b2 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
@@ -56,8 +56,10 @@ delete_pkg_m4_file() {
patch_gtk_doc_makefiles() {
# Patch the gtk-doc makefiles so that the qemu wrapper is used to run transient binaries
# instead of libtool wrapper or running them directly
+ # Also substitute a bogus plugin scanner, as trying to run the real one is causing issues during build on x86_64.
sed -i \
-e "s|GTKDOC_RUN =.*|GTKDOC_RUN = \$(top_builddir)/gtkdoc-qemuwrapper|" \
+ -e "s|\$(GTKDOC_EXTRA_ENVIRONMENT)|\$(GTKDOC_EXTRA_ENVIRONMENT) GST_PLUGIN_SCANNER_1_0=\$(top_builddir)/libs/gst/helpers/gst-plugin-scanner-dummy|" \
${S}/common/gtk-doc*mak
}