From 576587dae0eef3c6249d03bc27a045a0e5cf018c Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Fri, 26 Feb 2016 21:53:04 -0800 Subject: grub2.inc: dont export TARGET_CFLAGS etc to grub2 configure The grub2 configure script uses variables such as TARGET_CFLAGS etc for its own purposes. Remove the OE versions from the configure environment to avoid conflicts. (From OE-Core rev: 58a79e6bf7d8c6ec03581f14fb83da0eeb526cc6) Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-bsp/grub/grub2.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'meta/recipes-bsp') diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index 84a47273a5..5a12563975 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc @@ -44,10 +44,16 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[grub-mount] = "--enable-grub-mount,--disable-grub-mount,fuse" PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,lvm2" +do_configure_prepend() { + # The grub2 configure script uses variables such as TARGET_CFLAGS etc + # for its own purposes. Remove the OE versions from the environment to + # avoid conflicts. + unset TARGET_CPPFLAGS TARGET_CFLAGS TARGET_CXXFLAGS TARGET_LDFLAGS +} + # grub and grub-efi's sysroot/${datadir}/grub/grub-mkconfig_lib are # conflicted, remove it since no one uses it. SYSROOT_PREPROCESS_FUNCS_class-target += "remove_sysroot_mkconfig_lib" remove_sysroot_mkconfig_lib() { rm -r "${SYSROOT_DESTDIR}${datadir}/grub/grub-mkconfig_lib" } - -- cgit 1.2.3-korg