Waldemar Brodkorb преди 1 месец
родител
ревизия
a1ecc7e17b
променени са 1 файла, в които са добавени 12 реда и са изтрити 4 реда
  1. 12 4
      package/wget/Makefile

+ 12 - 4
package/wget/Makefile

@@ -4,19 +4,22 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		wget
-PKG_VERSION:=		1.19.4
+PKG_VERSION:=		1.24.5
 PKG_RELEASE:=		1
-PKG_HASH:=		93fb96b0f48a20ff5be0d9d9d3c4a986b469cb853131f9d5fe4cc9cecbc8b5b5
+PKG_HASH:=		fa2dc35bab5184ecbc46a9ef83def2aaaa3f4c9f3c97d4bd19dcb07d4da637de
 PKG_DESCR:=		retrieving files using http(s) and ftp
 PKG_SECTION:=		net/http
-HOST_BUILDDEP:=		libressl-host
+HOST_BUILDDEP:=		openssl-host
 PKG_URL:=		http://www.gnu.org/software/wget/
 PKG_SITES:=		${MASTER_SITE_GNU:=wget/}
 PKG_BB:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_CHOICES_WGET:=	WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL
+PKG_CHOICES_WGET:=	WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL
+PKGCD_WITH_OPENSSL:=	use openssl for crypto
+PKGCS_WITH_OPENSSL:=	libopenssl ca-certificates libgmp
+PKGCB_WITH_OPENSSL:=	openssl
 PKGCD_WITH_LIBRESSL:=	use libressl for crypto
 PKGCS_WITH_LIBRESSL:=	libressl ca-certificates libgmp
 PKGCB_WITH_LIBRESSL:=	libressl
@@ -36,6 +39,11 @@ CONFIGURE_ARGS+=	--disable-pcre
 ifeq (${ADK_PACKAGE_WGET_WITHOUT_SSL},y)
 CONFIGURE_ARGS+=	--with-ssl=no
 endif
+ifeq (${ADK_PACKAGE_WGET_WITH_OPENSSL},y)
+CONFIGURE_ARGS+=	--with-ssl=openssl \
+			--with-openssl=yes \
+			--with-libssl-prefix=${STAGING_TARGET_DIR}
+endif
 ifeq (${ADK_PACKAGE_WGET_WITH_LIBRESSL},y)
 CONFIGURE_ARGS+=	--with-ssl=openssl \
 			--with-openssl=yes \