summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-09-05 22:25:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-09 12:12:23 +0100
commit5041e6811f8d30ec6a4940a45b3b552d993e7a50 (patch)
treec6aa0cb669cd4f465e7434d721f57f3aeddc0abd
parentf22415435f92238ebeeb15142844874cfa157453 (diff)
downloadopenembedded-core-contrib-5041e6811f8d30ec6a4940a45b3b552d993e7a50.tar.gz
openembedded-core-contrib-5041e6811f8d30ec6a4940a45b3b552d993e7a50.tar.bz2
openembedded-core-contrib-5041e6811f8d30ec6a4940a45b3b552d993e7a50.zip
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. (From OE-Core rev: 50768af29ce8524f7bae387996aaed657a1ff80f) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc1
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0.inc1
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 5a61ca0ecc..9cfcec3ca5 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 e6bd2dd5b2..cb0bd82f23 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,