[oe-commits] Richard Purdie : wget: Fix re-execution issue

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: b3df34ba57284fa2c85f34be86d5d8e357becf7c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b3df34ba57284fa2c85f34be86d5d8e357becf7c

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Mon Apr 16 10:48:35 2012 +0100

wget: Fix re-execution issue

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 at linuxfoundation.org>

---

 .../wget/wget-1.13.4/fix_makefile.patch            |   13 -------------
 meta/recipes-extended/wget/wget.inc                |    2 +-
 2 files changed, 1 insertions(+), 14 deletions(-)

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
diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
index 96d49a5..d56216f 100644
--- a/meta/recipes-extended/wget/wget.inc
+++ b/meta/recipes-extended/wget/wget.inc
@@ -4,7 +4,7 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 DEPENDS = "openssl"
 
-INC_PR = "r13"
+INC_PR = "r14"
 
 inherit autotools gettext update-alternatives