sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Ross Burton 2016-09-05 22:25:17 +01:00 committed by Richard Purdie
parent f22415435f
commit 5041e6811f
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
View File

@ -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,

1
meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
View File

@ -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,