diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-16 10:48:35 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-16 12:52:09 +0100 |
| commit | 469d73a7339f8eadb9d9602665bd24eb534a2703 (patch) | |
| tree | 9fd57a2d30b2282fa2554acba897af0d9becd1b1 /meta | |
| parent | ccc2b23191a4cc406a9a5540712bfb62cb067236 (diff) | |
| download | poky-469d73a7339f8eadb9d9602665bd24eb534a2703.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]
(From OE-Core rev: b3df34ba57284fa2c85f34be86d5d8e357becf7c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/wget/wget-1.13.4/fix_makefile.patch | 13 | ||||
| -rw-r--r-- | 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 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 | |||
| 31 | 31 | ||
| 32 | AC_PROG_RANLIB | 32 | AC_PROG_RANLIB |
| 33 | 33 | ||
| 34 | Index: wget-1.12/configure | ||
| 35 | =================================================================== | ||
| 36 | --- wget-1.12.orig/configure 2009-09-22 09:40:13.000000000 -0700 | ||
| 37 | +++ wget-1.12/configure 2011-10-19 20:33:46.578812174 -0700 | ||
| 38 | @@ -5297,7 +5297,7 @@ | ||
| 39 | |||
| 40 | |||
| 41 | |||
| 42 | - GETTEXT_MACRO_VERSION=0.17 | ||
| 43 | + GETTEXT_MACRO_VERSION=0.18 | ||
| 44 | |||
| 45 | |||
| 46 | |||
| 47 | Index: wget-1.12/m4/po.m4 | 34 | Index: wget-1.12/m4/po.m4 |
| 48 | =================================================================== | 35 | =================================================================== |
| 49 | --- wget-1.12.orig/m4/po.m4 2009-09-04 09:31:54.000000000 -0700 | 36 | --- 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" | |||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
| 5 | DEPENDS = "openssl" | 5 | DEPENDS = "openssl" |
| 6 | 6 | ||
| 7 | INC_PR = "r13" | 7 | INC_PR = "r14" |
| 8 | 8 | ||
| 9 | inherit autotools gettext update-alternatives | 9 | inherit autotools gettext update-alternatives |
| 10 | 10 | ||
