* [Buildroot] [PATCH] wget: add upstream patch to fix build failure
@ 2017-02-08 13:32 Rahul Bedarkar
2017-02-08 14:42 ` Peter Korsgaard
0 siblings, 1 reply; 4+ messages in thread
From: Rahul Bedarkar @ 2017-02-08 13:32 UTC (permalink / raw)
To: buildroot
Fixes:
http://autobuild.buildroot.net/results/fed/fed53124d43c37629295ddc4cdc371f4dc862860
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
---
...-define-clash-with-gnulib-s-unlink-module.patch | 71 ++++++++++++++++++++++
1 file changed, 71 insertions(+)
create mode 100644 package/wget/0001-Fix-include-define-clash-with-gnulib-s-unlink-module.patch
diff --git a/package/wget/0001-Fix-include-define-clash-with-gnulib-s-unlink-module.patch b/package/wget/0001-Fix-include-define-clash-with-gnulib-s-unlink-module.patch
new file mode 100644
index 0000000..03c0a61
--- /dev/null
+++ b/package/wget/0001-Fix-include-define-clash-with-gnulib-s-unlink-module.patch
@@ -0,0 +1,71 @@
+From 31ac36e170f4777655451fce10a2fa5b2b27ecd7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Sat, 4 Feb 2017 18:02:54 +0100
+Subject: [PATCH] Fix include/define clash with gnulib's unlink module
+
+* src/options.h: Rename options.unlink to options.unlink_requested
+* src/init.c: Replace options unlink member by unlink_requested
+* src/http.c: Likewise
+* src/ftp.c: Likewise
+---
+ src/ftp.c | 2 +-
+ src/http.c | 2 +-
+ src/init.c | 2 +-
+ src/options.h | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/ftp.c b/src/ftp.c
+index fe09817..2f2866c 100644
+--- a/src/ftp.c
++++ b/src/ftp.c
+@@ -1463,7 +1463,7 @@ Error in server response, closing control connection.\n"));
+ else if (opt.noclobber || opt.always_rest || opt.timestamping || opt.dirstruct
+ || opt.output_document || count > 0)
+ {
+- if (opt.unlink && file_exists_p (con->target))
++ if (opt.unlink_requested && file_exists_p (con->target))
+ {
+ if (unlink (con->target) < 0)
+ {
+diff --git a/src/http.c b/src/http.c
+index bd1f115..3c3c8b2 100644
+--- a/src/http.c
++++ b/src/http.c
+@@ -2486,7 +2486,7 @@ open_output_stream (struct http_stat *hs, int count, FILE **fp)
+ }
+ else if (ALLOW_CLOBBER || count > 0)
+ {
+- if (opt.unlink && file_exists_p (hs->local_file))
++ if (opt.unlink_requested && file_exists_p (hs->local_file))
+ {
+ if (unlink (hs->local_file) < 0)
+ {
+diff --git a/src/init.c b/src/init.c
+index 271bc77..623ef9d 100644
+--- a/src/init.c
++++ b/src/init.c
+@@ -321,7 +321,7 @@ static const struct {
+ { "timestamping", &opt.timestamping, cmd_boolean },
+ { "tries", &opt.ntry, cmd_number_inf },
+ { "trustservernames", &opt.trustservernames, cmd_boolean },
+- { "unlink", &opt.unlink, cmd_boolean },
++ { "unlink", &opt.unlink_requested, cmd_boolean },
+ { "useaskpass" , &opt.use_askpass, cmd_use_askpass },
+ { "useproxy", &opt.use_proxy, cmd_boolean },
+ { "user", &opt.user, cmd_string },
+diff --git a/src/options.h b/src/options.h
+index d713acc..8a818ca 100644
+--- a/src/options.h
++++ b/src/options.h
+@@ -61,7 +61,7 @@ struct options
+ bool add_hostdir; /* Do we add hostname directory? */
+ bool protocol_directories; /* Whether to prepend "http"/"ftp" to dirs. */
+ bool noclobber; /* Disables clobbering of existing data. */
+- bool unlink; /* remove file before clobbering */
++ bool unlink_requested; /* remove file before clobbering */
+ char *dir_prefix; /* The top of directory tree */
+ char *lfilename; /* Log filename */
+ char *input_filename; /* Input filename */
+--
+2.6.2
+
--
2.6.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH] wget: add upstream patch to fix build failure
2017-02-08 13:32 [Buildroot] [PATCH] wget: add upstream patch to fix build failure Rahul Bedarkar
@ 2017-02-08 14:42 ` Peter Korsgaard
0 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2017-02-08 14:42 UTC (permalink / raw)
To: buildroot
>>>>> "Rahul" == Rahul Bedarkar <rahul.bedarkar@imgtec.com> writes:
> Fixes:
> http://autobuild.buildroot.net/results/fed/fed53124d43c37629295ddc4cdc371f4dc862860
> Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH] wget: add upstream patch to fix build failure
2017-02-10 6:54 Rahul Bedarkar
@ 2017-02-11 14:18 ` Thomas Petazzoni
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2017-02-11 14:18 UTC (permalink / raw)
To: buildroot
Hello,
On Fri, 10 Feb 2017 12:24:40 +0530, Rahul Bedarkar wrote:
> Fixes:
> http://autobuild.buildroot.net/results/c86/c8657563e63e1012a3ae3c0c47663a951e280022
>
> Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
> ---
> ...ve-skipping-libunistring-with-disable-iri.patch | 34 ++++++++++++++++++++++
> package/wget/wget.mk | 3 ++
> 2 files changed, 37 insertions(+)
> create mode 100644 package/wget/0002-Remove-skipping-libunistring-with-disable-iri.patch
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH] wget: add upstream patch to fix build failure
@ 2017-02-10 6:54 Rahul Bedarkar
2017-02-11 14:18 ` Thomas Petazzoni
0 siblings, 1 reply; 4+ messages in thread
From: Rahul Bedarkar @ 2017-02-10 6:54 UTC (permalink / raw)
To: buildroot
Fixes:
http://autobuild.buildroot.net/results/c86/c8657563e63e1012a3ae3c0c47663a951e280022
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
---
...ve-skipping-libunistring-with-disable-iri.patch | 34 ++++++++++++++++++++++
package/wget/wget.mk | 3 ++
2 files changed, 37 insertions(+)
create mode 100644 package/wget/0002-Remove-skipping-libunistring-with-disable-iri.patch
diff --git a/package/wget/0002-Remove-skipping-libunistring-with-disable-iri.patch b/package/wget/0002-Remove-skipping-libunistring-with-disable-iri.patch
new file mode 100644
index 0000000..4ccc46a
--- /dev/null
+++ b/package/wget/0002-Remove-skipping-libunistring-with-disable-iri.patch
@@ -0,0 +1,34 @@
+From 990f3d67d340d226bbd4187f5d310a4d2bf2bfe4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Mon, 6 Feb 2017 11:25:48 +0100
+Subject: [PATCH] Remove skipping libunistring with --disable-iri
+
+* configure.ac: Remove checking for IRI=no
+
+On certain systems, gnulib falls back to libunistring
+for mbtowc() and wcwidth() (used in src/progress.c).
+
+Reported-by: Zhiming Wang
+---
+ configure.ac | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8786e00..686f040 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -663,11 +663,6 @@ if test "X$iri" != "Xno"; then
+ # ])
+ ])
+ fi
+-if test "X$iri" = "Xno"; then
+- # we don't need libunistring - clear settings from gnulib module
+- LIBUNISTRING=""
+- LTLIBUNISTRING=""
+-fi
+
+ dnl
+ dnl Check for UUID
+--
+2.6.2
+
diff --git a/package/wget/wget.mk b/package/wget/wget.mk
index e0f680b..8698cdf 100644
--- a/package/wget/wget.mk
+++ b/package/wget/wget.mk
@@ -11,6 +11,9 @@ WGET_DEPENDENCIES = host-pkgconf
WGET_LICENSE = GPLv3+
WGET_LICENSE_FILES = COPYING
+# For 0002-Remove-skipping-libunistring-with-disable-iri.patch
+WGET_AUTORECONF = YES
+
# Prefer full-blown wget over busybox
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
WGET_DEPENDENCIES += busybox
--
2.6.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-02-11 14:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-08 13:32 [Buildroot] [PATCH] wget: add upstream patch to fix build failure Rahul Bedarkar
2017-02-08 14:42 ` Peter Korsgaard
2017-02-10 6:54 Rahul Bedarkar
2017-02-11 14:18 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.