From: Paul Eggleton Date: Tue, 24 Sep 2013 11:10:14 +0000 (+0100) Subject: grub: don't patch generated configure to fix do_patch re-execution X-Git-Tag: 2015-4~5071 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ae98a95577ba9c8a6a0d9a78d4cea33a92adff35;p=openembedded-core.git grub: don't patch generated configure to fix do_patch re-execution If do_patch re-executes, patching the configure script will fail because it will have been regenerated during do_configure. We're patching configure.ac so we don't need to patch configure anyway. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-bsp/grub/files/grub-2.00-fpmath-sse-387-fix.patch b/meta/recipes-bsp/grub/files/grub-2.00-fpmath-sse-387-fix.patch index bea594406f..c557f13e23 100644 --- a/meta/recipes-bsp/grub/files/grub-2.00-fpmath-sse-387-fix.patch +++ b/meta/recipes-bsp/grub/files/grub-2.00-fpmath-sse-387-fix.patch @@ -21,17 +21,4 @@ Index: grub-1.99/configure.ac + TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-3dnow -mfpmath=387" fi - # By default, GCC 4.4 generates .eh_frame sections containing unwind -Index: grub-1.99/configure -=================================================================== ---- grub-1.99.orig/configure -+++ grub-1.99/configure -@@ -19991,7 +19991,7 @@ $as_echo "$grub_cv_cc_falign_loop" >&6; - - # Some toolchains enable these features by default, but they need - # registers that aren't set up properly in GRUB. -- TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-3dnow" -+ TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-3dnow -mfpmath=387" - fi - # By default, GCC 4.4 generates .eh_frame sections containing unwind