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>
OSSystems · Sep 9, 2016 · aa6cc11 · aa6cc11
1 parent b81a310
commit aa6cc11
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/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/recipes-multimedia/gstreamer/gstreamer1.0.inc b/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,