summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-16 10:48:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-16 12:44:36 +0100
commitb3df34ba57284fa2c85f34be86d5d8e357becf7c (patch)
treef6976eaf6e4961b2d15d94307f1f67b257c6ecbc
parent1d8c40d5f2119b4c4ae8a9b2645ae572ea9a54ff (diff)
downloadopenembedded-core-b3df34ba57284fa2c85f34be86d5d8e357becf7c.tar.gz
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@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/wget/wget-1.13.4/fix_makefile.patch13
-rw-r--r--meta/recipes-extended/wget/wget.inc2
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 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