]> code.ossystems Code Review - openembedded-core.git/commitdiff
grub: don't patch generated configure to fix do_patch re-execution
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Tue, 24 Sep 2013 11:10:14 +0000 (12:10 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 24 Sep 2013 16:45:58 +0000 (17:45 +0100)
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 <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-bsp/grub/files/grub-2.00-fpmath-sse-387-fix.patch

index bea594406f31f428987675f082654d2379777c70..c557f13e238ded26c13348bad08a79d9ead91419 100644 (file)
@@ -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