Patchwork wget: Fix re-execution issue

login
register
mail settings
Submitter Richard Purdie
Date April 16, 2012, 9:48 a.m.
Message ID <1334569715.16992.68.camel@ted>
Download mbox | patch
Permalink /patch/25915/
State New
Headers show

Comments

Richard Purdie - April 16, 2012, 9:48 a.m.
The patch in this recipe patches both configure and configure.in which leads
to build failures once configure has executed and regenerated configure.

The fix to make patch re-executable is not to patch configure and
only patch configure.in.

[YOCTO #2194]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Koen Kooi - April 16, 2012, 10:50 a.m.
Op 16 apr. 2012, om 11:48 heeft Richard Purdie het volgende geschreven:

> The patch in this recipe patches both configure and configure.in which leads
> to build failures once configure has executed and regenerated configure.
> 
> The fix to make patch re-executable is not to patch configure and
> only patch configure.in.
> 
> [YOCTO #2194]
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Like the python recipe: pr bump

Patch

diff --git a/meta/recipes-extended/wget/wget-1.13.4/fix_makefile.patch b/meta/recipes-extended/wget/wget-1.13.4/fix_makefile.patch
index 3f34c76..b76a017 100644
--- a/meta/recipes-extended/wget/wget-1.13.4/fix_makefile.patch
+++ b/meta/recipes-extended/wget/wget-1.13.4/fix_makefile.patch
@@ -31,19 +31,6 @@  Index: wget-1.12/configure.ac
  
  AC_PROG_RANLIB
  
-Index: wget-1.12/configure
-===================================================================
---- wget-1.12.orig/configure	2009-09-22 09:40:13.000000000 -0700
-+++ wget-1.12/configure	2011-10-19 20:33:46.578812174 -0700
-@@ -5297,7 +5297,7 @@
- 
- 
- 
--      GETTEXT_MACRO_VERSION=0.17
-+      GETTEXT_MACRO_VERSION=0.18
- 
- 
- 
 Index: wget-1.12/m4/po.m4
 ===================================================================
 --- wget-1.12.orig/m4/po.m4	2009-09-04 09:31:54.000000000 -0700