From da156d7176dc91ea74faa64b578bb7388c9e035f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 7 Mar 2014 10:49:59 +0000 Subject: [PATCH] wayland: Add target sysroot scanner m4 macro 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. (From OE-Core rev: ad9bd9ce164c9cb1212de27fec84ad0fe5214bb2) Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/wayland_1.4.0.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-graphics/wayland/wayland_1.4.0.bb b/meta/recipes-graphics/wayland/wayland_1.4.0.bb index 0f08cac..604b7f4 100644 --- a/meta/recipes-graphics/wayland/wayland_1.4.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.4.0.bb @@ -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/ +} -- 2.7.4