summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer/files
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-12-20 13:03:03 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-07 14:05:39 +0000
commitb7376a36a3beb36131a791d79d66eb0110b7b954 (patch)
tree5aba51997ac9bd31b3b7225766cfa6f67159bad1 /meta/recipes-multimedia/gstreamer/files
parent492f842360888a914cae4bf5c975205d24b773ec (diff)
downloadpoky-b7376a36a3beb36131a791d79d66eb0110b7b954.tar.gz
gstreamer: use a patch instead of sed to fix gtk-doc makefiles
seds can get stale without warning and repeated application can cause problems, so move the gtk-doc seds into a patch. (From OE-Core rev: a704411ab0f1e5f8cbf57ff54b36d60ccaf0d223) (From OE-Core rev: e0a4e78b879eeacff8ef6803c1345056abf018e7) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/files')
-rw-r--r--meta/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch b/meta/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch
new file mode 100644
index 0000000000..593d5bb043
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch
@@ -0,0 +1,25 @@
1Patch the gtk-doc makefiles so that the qemu wrapper is used to run transient
2binaries instead of libtool wrapper or running them directly.
3
4Also substitute a bogus plugin scanner, as trying to run the real one is causing
5issues during build on x86_64.
6
7Upstream-Status: Inappropriate
8Signed-off-by: Ross Burton <ross.burton@intel.com>
9
10--- a/common/gtk-doc.mak.orig 2017-12-20 12:43:20.586474397 +0000
11+++ b/common/gtk-doc.mak 2017-12-20 12:45:20.758874995 +0000
12@@ -8,3 +8,3 @@
13 GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
14-GTKDOC_RUN = $(LIBTOOL) --mode=execute
15+GTKDOC_RUN = $(top_builddir)/gtkdoc-qemuwrapper
16 else
17@@ -12,3 +12,3 @@
18 GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
19-GTKDOC_RUN =
20+GTKDOC_RUN = $(top_builddir)/gtkdoc-qemuwrapper
21 endif
22@@ -99,2 +99,3 @@
23 fi; \
24+ GST_PLUGIN_SCANNER_1_0="$(top_builddir)/libs/gst/helpers/gst-plugin-scanner-dummy" \
25 GST_PLUGIN_SYSTEM_PATH_1_0=`cd $(top_builddir) && pwd` \