diff options
| author |   Ross Burton <ross.burton@intel.com> | 2016-09-05 22:25:17 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-09 12:12:17 +0100 |
| commit | 50768af29ce8524f7bae387996aaed657a1ff80f (patch) | |
| tree | c80da51602ede4a21c599e488891d5d3d143016b | |
| parent | d3c48ff7d19e86b2338b1778f9563969bba3d336 (diff) | |
| download | openembedded-core-contrib-50768af29ce8524f7bae387996aaed657a1ff80f.tar.gz | |
gstreamer: remove packaged copy of gtk-doc.m4
The gstreamer common module ships a copy of gtk-doc.m4 that will be used in
preference to our patched form, so delete it before configure is executed.
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0.inc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc index 5a61ca0ecc6..9cfcec3ca58 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc @@ -33,6 +33,7 @@ SRC_URI_append = " file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_ delete_pkg_m4_file() { # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection rm "${S}/common/m4/pkg.m4" || true + rm -f "${S}/common/m4/gtk-doc.m4" } # gstreamer is not using system-wide makefiles (which we patch in gtkdoc recipe, diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc index e6bd2dd5b25..cb0bd82f236 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc @@ -49,6 +49,7 @@ RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-raw delete_pkg_m4_file() { # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection rm "${S}/common/m4/pkg.m4" || true + rm -f "${S}/common/m4/gtk-doc.m4" } # gstreamer is not using system-wide makefiles (which we patch in gtkdoc recipe, |