Patchwork wayland: Add target sysroot scanner m4 macro

mail settings
Submitter Richard Purdie
Date March 7, 2014, 10:49 a.m.
Message ID <1394189399.12327.31.camel@ted>
Download mbox | patch
Permalink /patch/68245/
State Accepted
Commit 7b70586a31e3df0ba35a7766b3b9d48e0d5d75b9
Headers show


Richard Purdie - March 7, 2014, 10:49 a.m.
With the new aclocals process, accesses to the macros is a lot stricter and
the native macros are not used. We need to ensure the modified macros are used
in target builds to get the correct scanner functionality. Inserting the
native macro into the target is the correct thing to do in this case.

This resolves build failures in libva.

Signed-off-by: Richard Purdie <>


diff --git a/meta/recipes-graphics/wayland/ b/meta/recipes-graphics/wayland/
index 0f08cac..604b7f4 100644
--- a/meta/recipes-graphics/wayland/
+++ b/meta/recipes-graphics/wayland/
@@ -34,3 +34,7 @@  do_install_append_class-native() {
       -e 's,$PKG_CONFIG,pkg-config-native,g' \
       -i ${D}/${datadir}/aclocal/wayland-scanner.m4
+sysroot_stage_all_append_class-target () {
+	cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/