From 469d73a7339f8eadb9d9602665bd24eb534a2703 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 16 Apr 2012 10:48:35 +0100 Subject: 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] (From OE-Core rev: b3df34ba57284fa2c85f34be86d5d8e357becf7c) Signed-off-by: Richard Purdie --- meta/recipes-extended/wget/wget-1.13.4/fix_makefile.patch | 13 ------------- meta/recipes-extended/wget/wget.inc | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) (limited to 'meta') 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 3f34c7690b..b76a017df6 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 96d49a56d2..d56216f071 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 -- cgit v1.2.3-54-g00ecf