diff options
| author |   Ross Burton <ross.burton@intel.com> | 2017-12-20 13:03:03 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-07 12:28:30 +0000 |
| commit | e0a4e78b879eeacff8ef6803c1345056abf018e7 (patch) | |
| tree | b5fe498c0b5b04af1f29861dc54a2e63b13f5eae /meta/recipes-multimedia/gstreamer/files | |
| parent | bb70e05e709d1e1bb1e2a490d1de244fba703f54 (diff) | |
| download | openembedded-core-contrib-e0a4e78b879eeacff8ef6803c1345056abf018e7.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)
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.patch | 25 |
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 @@ +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. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@intel.com> + +--- a/common/gtk-doc.mak.orig 2017-12-20 12:43:20.586474397 +0000 ++++ b/common/gtk-doc.mak 2017-12-20 12:45:20.758874995 +0000 +@@ -8,3 +8,3 @@ + GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-GTKDOC_RUN = $(LIBTOOL) --mode=execute ++GTKDOC_RUN = $(top_builddir)/gtkdoc-qemuwrapper + else +@@ -12,3 +12,3 @@ + GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-GTKDOC_RUN = ++GTKDOC_RUN = $(top_builddir)/gtkdoc-qemuwrapper + endif +@@ -99,2 +99,3 @@ + fi; \ ++ GST_PLUGIN_SCANNER_1_0="$(top_builddir)/libs/gst/helpers/gst-plugin-scanner-dummy" \ + GST_PLUGIN_SYSTEM_PATH_1_0=`cd $(top_builddir) && pwd` \ |