Patchwork grub: don't patch generated configure to fix do_patch re-execution

login
register
mail settings
Submitter Paul Eggleton
Date Sept. 24, 2013, 11:10 a.m.
Message ID <1380021014-16042-1-git-send-email-paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/58655/
State Accepted
Commit ae98a95577ba9c8a6a0d9a78d4cea33a92adff35
Headers show

Comments

Paul Eggleton - Sept. 24, 2013, 11:10 a.m.
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>
---
 .../grub/files/grub-2.00-fpmath-sse-387-fix.patch           | 13 -------------
 1 file changed, 13 deletions(-)

Patch

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 bea5944..c557f13 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
@@ -22,16 +22,3 @@  Index: grub-1.99/configure.ac
  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