[oe-commits] [openembedded-core] 08/32: grub2.inc: dont export TARGET_CFLAGS etc to grub2 configure

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 58a79e6bf7d8c6ec03581f14fb83da0eeb526cc6
Author: Andre McCurdy <armccurdy at gmail.com>
AuthorDate: Fri Feb 26 21:53:04 2016 -0800

    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.
    
    Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-bsp/grub/grub2.inc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc
index 84a4727..5a12563 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"
 }
-

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.