package/wget: explicit set some default options
PATCH v2 1/5 package/wget: explicit set some default options
- explicit set some default options (--without-metalink, --enable-opie, --enable-digest, --enable-ntlm, --disable-debug, --disable-valgrind-tests, --disable-assert)
---
Changes v1 -> v2:
- split out from original patch
--- package/wget/wget.mk | 9 +++++++++ 1 file changed, 9 insertions(+)
package/wget/wget.mk +9 -0
@@ -12,6 +12,15 @@ WGET_LICENSE = GPL-3.0+ WGET_LICENSE_FILES = COPYING WGET_CPE_ID_VENDOR = gnu +WGET_CONF_OPTS = \ + --without-metalink \ + --enable-opie \ + --enable-digest \ + --enable-ntlm \ + --disable-debug \ + --disable-valgrind-tests \ + --disable-assert + ifeq ($(BR2_PACKAGE_GNUTLS),y) WGET_CONF_OPTS += --with-ssl=gnutls WGET_DEPENDENCIES += gnutls
Signature · 6 lines
2.35.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 2/5 package/wget: use explicit --with/without-libuuid option
- use explicit --with/without-libuuid option
---
Changes v1 -> v2:
- split out from original patch
--- package/wget/wget.mk | 3 +++ 1 file changed, 3 insertions(+)
package/wget/wget.mk +3 -0
@@ -43,7 +43,10 @@ WGET_CONF_OPTS += --without-libidn endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) +WGET_CONF_OPTS += --with-libuuid WGET_DEPENDENCIES += util-linux +else +WGET_CONF_OPTS += --without-libuuid endif ifeq ($(BR2_PACKAGE_ZLIB),y)
Signature · 6 lines
2.35.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Yann E. MORIN
AppliedRe: [Buildroot] [PATCH v2 2/5] package/wget: use explicit --with/without-libuuid option
On 2022-03-18 21:20 +0100, Peter Seiderer spake thusly:
Quoted 1 line
- use explicit --with/without-libuuid option
Repeating the commit title in the commit log is not very helpul...
Applied to master with that fixed, thanks.
Regards,
Yann E. MORIN.
Quoted 30 lines
Signed-off-by Peter Seiderer <[email protected]>---
Changes v1 -> v2:
- split out from original patch--- package/wget/wget.mk | 3 +++ 1 file changed, 3 insertions(+)package/wget/wget.mk +3
-0@@ -43,7 +43,10 @@ WGET_CONF_OPTS += --without-libidn endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) +WGET_CONF_OPTS += --with-libuuid WGET_DEPENDENCIES += util-linux +else +WGET_CONF_OPTS += --without-libuuid endif ifeq ($(BR2_PACKAGE_ZLIB),y)Signature · 6 lines
2.35.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 2/5] package/wget: use explicit --with/without-libuuid option
In reply to Peter SeidererQuoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Seiderer <[email protected]> writes:
- use explicit --with/without-libuuid option
Signed-off-by Peter Seiderer <[email protected]>
Committed to 2022.02.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 3/5 package/wget: add optional libpsl dependency
In reply to Peter Seiderer- add optional libpsl dependency
---
Changes v1 -> v2:
- split out from original patch
--- package/wget/wget.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/wget/wget.mk +7 -0
@@ -21,6 +21,13 @@ WGET_CONF_OPTS = \ --disable-valgrind-tests \ --disable-assert +ifeq ($(BR2_PACKAGE_LIBPSL),y) +WGET_CONF_OPTS += --with-libpsl +WGET_DEPENDENCIES += libpsl +else +WGET_CONF_OPTS += --without-libpsl +endif + ifeq ($(BR2_PACKAGE_GNUTLS),y) WGET_CONF_OPTS += --with-ssl=gnutls WGET_DEPENDENCIES += gnutls
Signature · 6 lines
2.35.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Yann E. MORIN
AppliedRe: [Buildroot] [PATCH v2 3/5] package/wget: add optional libpsl dependency
On 2022-03-18 21:20 +0100, Peter Seiderer spake thusly:
Quoted 3 lines
- add optional libpsl dependency
Signed-off-by Peter Seiderer <[email protected]>
Applied to master, commit elided, thanks.
Regards,
Yann E. MORIN.
Quoted 32 lines
---
Changes v1 -> v2:
- split out from original patch--- package/wget/wget.mk | 7 +++++++ 1 file changed, 7 insertions(+)package/wget/wget.mk +7
-0@@ -21,6 +21,13 @@ WGET_CONF_OPTS = \ --disable-valgrind-tests \ --disable-assert +ifeq ($(BR2_PACKAGE_LIBPSL),y) +WGET_CONF_OPTS += --with-libpsl +WGET_DEPENDENCIES += libpsl +else +WGET_CONF_OPTS += --without-libpsl +endif + ifeq ($(BR2_PACKAGE_GNUTLS),y) WGET_CONF_OPTS += --with-ssl=gnutls WGET_DEPENDENCIES += gnutlsSignature · 6 lines
2.35.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 3/5] package/wget: add optional libpsl dependency
In reply to Peter SeidererQuoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Seiderer <[email protected]> writes:
- add optional libpsl dependency
Signed-off-by Peter Seiderer <[email protected]>---
Changes v1 -> v2:
- split out from original patch
Committed to 2022.02.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 4/5 package/wget: add optional c-ares dependency
In reply to Peter Seiderer- add optional c-ares dependency
---
Changes v1 -> v2:
- split out from original patch
--- package/wget/wget.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/wget/wget.mk +7 -0
@@ -63,6 +63,13 @@ else WGET_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_C_ARES),y) +WGET_CONF_OPTS += --with-cares +WGET_DEPENDENCIES += c-ares +else +WGET_CONF_OPTS += --without-cares +endif + ifeq ($(BR2_PACKAGE_PCRE2),y) WGET_CONF_OPTS += --disable-pcre --enable-pcre2 WGET_DEPENDENCIES += pcre2
Signature · 6 lines
2.35.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Yann E. MORIN
AppliedRe: [Buildroot] [PATCH v2 4/5] package/wget: add optional c-ares dependency
Peter, All,
On 2022-03-18 21:20 +0100, Peter Seiderer spake thusly:
Quoted 1 line
- add optional c-ares dependency
Again, not very usefull... But there isn't much to say in this commit, the title is far sufficient, so an empty commit log is OK.
(Who would have guessed I would ever say that? Who'd have bet? ;-) )
Quoted 1 line
Signed-off-by Peter Seiderer <[email protected]>
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 32 lines
---
Changes v1 -> v2:
- split out from original patch--- package/wget/wget.mk | 7 +++++++ 1 file changed, 7 insertions(+)package/wget/wget.mk +7
-0@@ -63,6 +63,13 @@ else WGET_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_C_ARES),y) +WGET_CONF_OPTS += --with-cares +WGET_DEPENDENCIES += c-ares +else +WGET_CONF_OPTS += --without-cares +endif + ifeq ($(BR2_PACKAGE_PCRE2),y) WGET_CONF_OPTS += --disable-pcre --enable-pcre2 WGET_DEPENDENCIES += pcre2Signature · 6 lines
2.35.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 4/5] package/wget: add optional c-ares dependency
In reply to Peter SeidererQuoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Seiderer <[email protected]> writes:
- add optional c-ares dependency
Signed-off-by Peter Seiderer <[email protected]>---
Changes v1 -> v2:
- split out from original patch
Committed to 2022.02.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 5/5 package/wget: bump version to 1.21.3
In reply to Peter Seiderer- bump version to 1.21.3 (for details see [1])
- remove legacy --with-libidn option (see [2]), replace with --enable-iri option in case locale support and libidn2 are available
[1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html
[2] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296
---
Changes v1 -> v2:
- split out from original patch
- fix iri option enable dependency
--- package/wget/wget.hash | 4 ++-- package/wget/wget.mk | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-)
package/wget/wget.hash +2 -2
@@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.lz.sig +# https://ftp.gnu.org/gnu/wget/wget-1.21.3.tar.lz.sig # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 -sha256 1727a330a86acacb3e57615ce268f5f29978bf7adec4abe6a30d370207bc91b3 wget-1.21.2.tar.lz +sha256 dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5 wget-1.21.3.tar.lz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING
package/wget/wget.mk +6 -8
@@ -4,7 +4,7 @@ # ################################################################################ -WGET_VERSION = 1.21.2 +WGET_VERSION = 1.21.3 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf
@@ -38,15 +38,13 @@ else WGET_CONF_OPTS += --without-ssl endif -ifeq ($(BR2_PACKAGE_LIBICONV),y) -WGET_DEPENDENCIES += libiconv -endif - -ifeq ($(BR2_PACKAGE_LIBIDN2),y) -WGET_CONF_OPTS += --with-libidn +# BR2_ENABLE_LOCALE and BR2_PACKAGE_LIBICONV are mutually exclusive +ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) +WGET_CONF_OPTS += --enable-iri WGET_DEPENDENCIES += libidn2 +WGET_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) else -WGET_CONF_OPTS += --without-libidn +WGET_CONF_OPTS += --disable-iri endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y)
Signature · 6 lines
2.35.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 5/5] package/wget: bump version to 1.21.3
Hello *,
Quoted 45 lines · Peter Seiderer
- bump version to 1.21.3 (for details see [1])
- remove legacy --with-libidn option (see [2]), replace with --enable-iri option in case locale support and libidn2 are available
[1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html
[2] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296Signed-off-by Peter Seiderer <[email protected]>---
Changes v1 -> v2:
- split out from original patch
- fix iri option enable dependency--- package/wget/wget.hash | 4 ++-- package/wget/wget.mk | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-)package/wget/wget.hash +2
-2@@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.lz.sig +# https://ftp.gnu.org/gnu/wget/wget-1.21.3.tar.lz.sig # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 -sha256 1727a330a86acacb3e57615ce268f5f29978bf7adec4abe6a30d370207bc91b3 wget-1.21.2.tar.lz +sha256 dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5 wget-1.21.3.tar.lz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYINGpackage/wget/wget.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -WGET_VERSION = 1.21.2 +WGET_VERSION = 1.21.3 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf
package/wget/wget.mk else · line 43
Quoted 6 lines
package/wget/wget.mk +0
-3@@ -38,15 +38,13 @@ else WGET_CONF_OPTS += --without-ssl endif -ifeq ($(BR2_PACKAGE_LIBICONV),y) -WGET_DEPENDENCIES += libiconv -endif
The above code one should be kept as there is at least one other location in the source using iconv (protexted by '#ifdef HAVE_ICONV', see src/url.c)...
package/wget/wget.mk else · line 45
Quoted 8 lines
package/wget/wget.mk +4
-3- -ifeq ($(BR2_PACKAGE_LIBIDN2),y) -WGET_CONF_OPTS += --with-libidn +# BR2_ENABLE_LOCALE and BR2_PACKAGE_LIBICONV are mutually exclusive +ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) +WGET_CONF_OPTS += --enable-iri WGET_DEPENDENCIES += libidn2 +WGET_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
And so the above line can be removed...
Will send an updated patch set...
Regards,
Peter
package/wget/wget.mk else · line 50
Quoted 6 lines
package/wget/wget.mk +1
-1else -WGET_CONF_OPTS += --without-libidn +WGET_CONF_OPTS += --disable-iri endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y)
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Peter, All,
On 2022-03-18 21:20 +0100, Peter Seiderer spake thusly:
Quoted 3 lines
- explicit set some default options (--without-metalink, --enable-opie, --enable-digest, --enable-ntlm, --disable-debug, --disable-valgrind-tests, --disable-assert)
Repeating the title and the code in the commit message is not very helpful.
What would be more intertesting, is to explain why you did need to set those options, and just those, among all the others that are available, like attr, iri... (I think that is basically what Thomas asked for in his review of your v1).
I see that your series will also introduces some optional support (libpsl, c-ares), but if just this first patch is applied, then that also leaves those options unset, so this first patch should really add defaults to all options.
Regards,
Yann E. MORIN.
Quoted 35 lines
Signed-off-by Peter Seiderer <[email protected]>---
Changes v1 -> v2:
- split out from original patch--- package/wget/wget.mk | 9 +++++++++ 1 file changed, 9 insertions(+)package/wget/wget.mk +9
-0@@ -12,6 +12,15 @@ WGET_LICENSE = GPL-3.0+ WGET_LICENSE_FILES = COPYING WGET_CPE_ID_VENDOR = gnu +WGET_CONF_OPTS = \ + --without-metalink \ + --enable-opie \ + --enable-digest \ + --enable-ntlm \ + --disable-debug \ + --disable-valgrind-tests \ + --disable-assert + ifeq ($(BR2_PACKAGE_GNUTLS),y) WGET_CONF_OPTS += --with-ssl=gnutls WGET_DEPENDENCIES += gnutlsSignature · 6 lines
2.35.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot