diff mbox

gstreamer1.0-omx: delete broken m4 files

Message ID 1495805833-413-1-git-send-email-ross.burton@intel.com
State Accepted
Commit 4292886ee3b2311902af2b5aaa5f53c5b36c6bee
Headers show

Commit Message

Ross Burton May 26, 2017, 1:37 p.m. UTC 
These m4 files need to be deleted so that the versions in the sysroot that we've
patched are used.  Specifically, building documentation fails as the gtk-doc
checks fail.

Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

-- 
2.8.1

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff mbox

Patch

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
index 05562b1..5d92351 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
@@ -29,10 +29,17 @@  python __anonymous () {
         d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH"))
 }
 
+delete_pkg_m4_file() {
+    # Delete m4 files which we provide patched versions of but will be ignored
+    # if these exist
+	rm -f "${S}/common/m4/pkg.m4"
+	rm -f "${S}/common/m4/gtk-doc.m4"
+}
+do_configure[prefuncs] += "delete_pkg_m4_file"
+
 set_omx_core_name() {
 	sed -i -e "s;^core-name=.*;core-name=${GSTREAMER_1_0_OMX_CORE_NAME};" "${D}${sysconfdir}/xdg/gstomx.conf"
 }
-
 do_install[postfuncs] += " set_omx_core_name "
 
 FILES_${PN} += "${libdir}/gstreamer-1.0/*.so"