[oe-commits] [openembedded-core] 63/66: gstreamer: remove packaged copy of gtk-doc.m4

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 9c84f308b6d5a40f0ca0d773f04925bd78e2384d
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Mon Sep 5 22:25:17 2016 +0100

    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 at intel.com>
---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc | 1 +
 meta/recipes-multimedia/gstreamer/gstreamer1.0.inc         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
index 5a61ca0..9cfcec3 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 e6bd2dd..cb0bd82 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,

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.