diff options
Diffstat (limited to 'recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch')
| -rw-r--r-- | recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch b/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch deleted file mode 100644 index d86c78d79..000000000 --- a/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch +++ /dev/null | |||
| @@ -1,47 +0,0 @@ | |||
| 1 | From 7018ca1c4bf26c8317e7fcd2e7e4e648195f42ca Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Ross Burton <ross.burton@intel.com> | ||
| 3 | Date: Wed, 20 Dec 2017 13:03:03 +0000 | ||
| 4 | Subject: [PATCH] gstreamer: use a patch instead of sed to fix gtk-doc | ||
| 5 | |||
| 6 | Patch the gtk-doc makefiles so that the qemu wrapper is used to run transient | ||
| 7 | binaries instead of libtool wrapper or running them directly. | ||
| 8 | |||
| 9 | Also substitute a bogus plugin scanner, as trying to run the real one is causing | ||
| 10 | issues during build on x86_64. | ||
| 11 | |||
| 12 | Upstream-Status: Inappropriate | ||
| 13 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
| 14 | |||
| 15 | --- | ||
| 16 | common/gtk-doc.mak | 5 +++-- | ||
| 17 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/common/gtk-doc.mak b/common/gtk-doc.mak | ||
| 20 | index 3f83491..e5cb0d1 100644 | ||
| 21 | --- a/common/gtk-doc.mak | ||
| 22 | +++ b/common/gtk-doc.mak | ||
| 23 | @@ -6,11 +6,11 @@ | ||
| 24 | if GTK_DOC_USE_LIBTOOL | ||
| 25 | GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
| 26 | GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) | ||
| 27 | -GTKDOC_RUN = $(LIBTOOL) --mode=execute | ||
| 28 | +GTKDOC_RUN = $(top_builddir)/gtkdoc-qemuwrapper | ||
| 29 | else | ||
| 30 | GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
| 31 | GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) | ||
| 32 | -GTKDOC_RUN = | ||
| 33 | +GTKDOC_RUN = $(top_builddir)/gtkdoc-qemuwrapper | ||
| 34 | endif | ||
| 35 | |||
| 36 | # We set GPATH here; this gives us semantics for GNU make | ||
| 37 | @@ -101,6 +101,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) | ||
| 38 | GST_PLUGIN_PATH_1_0= \ | ||
| 39 | GST_REGISTRY_1_0=doc-registry.xml \ | ||
| 40 | $(GTKDOC_EXTRA_ENVIRONMENT) \ | ||
| 41 | + GST_PLUGIN_SCANNER_1_0="$(top_builddir)/libs/gst/helpers/gst-plugin-scanner-dummy" \ | ||
| 42 | CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" \ | ||
| 43 | CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" \ | ||
| 44 | LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ | ||
| 45 | -- | ||
| 46 | 2.15.1 | ||
| 47 | |||
