From d48b9f13af440bad37de6056649e4451d2c3a92a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 5 Sep 2016 21:56:04 +0300 Subject: gstreamer: do not attempt to run a plugin scanner during gtk-doc generation Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc | 2 ++ meta/recipes-multimedia/gstreamer/gstreamer1.0.inc | 2 ++ 2 files changed, 4 insertions(+) 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 } -- cgit 1.2.3-korg