wget: bump to version 1.13.4 and improvements

* Bump wget to version 1.13.4
* Enable wget again on !wchar toolchains
* Enable support for gnutls

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Gustavo Zacarias 2011-10-15 00:07:33 -03:00 committed by Peter Korsgaard
parent c245be2bc7
commit b79ab02d46
2 changed files with 20 additions and 6 deletions

View File

@ -1,10 +1,6 @@
config BR2_PACKAGE_WGET
bool "wget"
depends on BR2_USE_WCHAR
help
Network utility to retrieve files from http, https and ftp.
http://www.gnu.org/software/wget/
comment "wget requires a toolchain with WCHAR support"
depends on !BR2_USE_WCHAR

View File

@ -4,12 +4,30 @@
#
#############################################################
WGET_VERSION = 1.12
WGET_VERSION = 1.13.4
WGET_SITE = $(BR2_GNU_MIRROR)/wget
# Prefer full-blown wget over busybox
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
WGET_DEPENDENCIES += busybox
endif
ifeq ($(BR2_PACKAGE_GNUTLS),y)
WGET_CONF_OPT += --with-ssl=gnutls \
--with-libgnutls-prefix=$(STAGING_DIR)
WGET_DEPENDENCIES += gnutls
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
WGET_CONF_OPT += --with-ssl --with-libssl-prefix=$(STAGING_DIR)
WGET_CONF_OPT += --with-ssl=openssl --with-libssl-prefix=$(STAGING_DIR)
WGET_DEPENDENCIES += openssl
endif
# --with-ssl is default
ifneq ($(BR2_PACKAGE_GNUTLS),y)
ifneq ($(BR2_PACKAGE_OPENSSL),y)
WGET_CONF_OPT += --without-ssl
endif
endif
$(eval $(call AUTOTARGETS))