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:23 +0100 |
| commit | 5041e6811f8d30ec6a4940a45b3b552d993e7a50 (patch) | |
| tree | c6aa0cb669cd4f465e7434d721f57f3aeddc0abd /meta | |
| parent | f22415435f92238ebeeb15142844874cfa157453 (diff) | |
| download | poky-5041e6811f8d30ec6a4940a45b3b552d993e7a50.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.
(From OE-Core rev: 50768af29ce8524f7bae387996aaed657a1ff80f)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -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 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_ | |||
| 33 | delete_pkg_m4_file() { | 33 | delete_pkg_m4_file() { |
| 34 | # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection | 34 | # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection |
| 35 | rm "${S}/common/m4/pkg.m4" || true | 35 | rm "${S}/common/m4/pkg.m4" || true |
| 36 | rm -f "${S}/common/m4/gtk-doc.m4" | ||
| 36 | } | 37 | } |
| 37 | 38 | ||
| 38 | # gstreamer is not using system-wide makefiles (which we patch in gtkdoc recipe, | 39 | # 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 | |||
| 49 | delete_pkg_m4_file() { | 49 | delete_pkg_m4_file() { |
| 50 | # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection | 50 | # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection |
| 51 | rm "${S}/common/m4/pkg.m4" || true | 51 | rm "${S}/common/m4/pkg.m4" || true |
| 52 | rm -f "${S}/common/m4/gtk-doc.m4" | ||
| 52 | } | 53 | } |
| 53 | 54 | ||
| 54 | # gstreamer is not using system-wide makefiles (which we patch in gtkdoc recipe, | 55 | # gstreamer is not using system-wide makefiles (which we patch in gtkdoc recipe, |