summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/wget
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2019-01-09 15:19:40 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-11 10:39:09 +0000
commit85f906e7c315c547371af5b704c11d1ef3190833 (patch)
tree4709a3265a95d93c2403991887a80bff6edafaef /meta/recipes-extended/wget
parent97b9198e04f1e6915a90b8a50c48b95e456bcdd1 (diff)
downloadpoky-85f906e7c315c547371af5b704c11d1ef3190833.tar.gz
wget: upgrade 1.19.5 -> 1.20.1
Drop 0001-Unset-need_charset_alias-when-building-for-musl.patch as it had been fixed upstream. (From OE-Core rev: 491c0ee55e7c6aa71ef5590cc38f866d9098bfe0) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/wget')
-rw-r--r--meta/recipes-extended/wget/wget/0001-Unset-need_charset_alias-when-building-for-musl.patch30
-rw-r--r--meta/recipes-extended/wget/wget_1.19.5.bb9
-rw-r--r--meta/recipes-extended/wget/wget_1.20.1.bb8
3 files changed, 8 insertions, 39 deletions
diff --git a/meta/recipes-extended/wget/wget/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/wget/wget/0001-Unset-need_charset_alias-when-building-for-musl.patch
deleted file mode 100644
index 0b3c6f5557..0000000000
--- a/meta/recipes-extended/wget/wget/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 13 Apr 2015 17:02:13 -0700
4Subject: [PATCH] Unset need_charset_alias when building for musl
5
6localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
7which actually shoudl be fixed in gnulib and then all downstream
8projects will get it eventually. For now we apply the fix to
9coreutils
10
11Upstream-Status: Pending
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 lib/gnulib.mk | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18Index: wget-1.16.3/lib/Makefile.am
19===================================================================
20--- wget-1.16.3.orig/lib/Makefile.am
21+++ wget-1.16.3/lib/Makefile.am
22@@ -846,7 +846,7 @@ install-exec-localcharset: all-local
23 case '$(host_os)' in \
24 darwin[56]*) \
25 need_charset_alias=true ;; \
26- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
27+ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
28 need_charset_alias=false ;; \
29 *) \
30 need_charset_alias=true ;; \
diff --git a/meta/recipes-extended/wget/wget_1.19.5.bb b/meta/recipes-extended/wget/wget_1.19.5.bb
deleted file mode 100644
index e37d8c7847..0000000000
--- a/meta/recipes-extended/wget/wget_1.19.5.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
2 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
3 file://0002-improve-reproducibility.patch \
4 "
5
6SRC_URI[md5sum] = "2db6f03d655041f82eb64b8c8a1fa7da"
7SRC_URI[sha256sum] = "b39212abe1a73f2b28f4c6cb223c738559caac91d6e416a6d91d4b9d55c9faee"
8
9require wget.inc
diff --git a/meta/recipes-extended/wget/wget_1.20.1.bb b/meta/recipes-extended/wget/wget_1.20.1.bb
new file mode 100644
index 0000000000..d176bd0acd
--- /dev/null
+++ b/meta/recipes-extended/wget/wget_1.20.1.bb
@@ -0,0 +1,8 @@
1SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
2 file://0002-improve-reproducibility.patch \
3 "
4
5SRC_URI[md5sum] = "f6ebe9c7b375fc9832fb1b2028271fb7"
6SRC_URI[sha256sum] = "b783b390cb571c837b392857945f5a1f00ec6b043177cc42abb8ee1b542ee1b3"
7
8require wget.inc