From 26e2aca4359bc7cff080c8446a67b838a5026d15 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 20 Oct 2015 07:58:13 +0200 Subject: ssl: rework ssl support Use libressl as default, where SSL is required. Allow to choose openssl. Disable SSL where not strictly required to build. --- package/wget/Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'package/wget') diff --git a/package/wget/Makefile b/package/wget/Makefile index 17eac1cb5..07edf440f 100644 --- a/package/wget/Makefile +++ b/package/wget/Makefile @@ -16,8 +16,11 @@ PKG_BB:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_CHOICES_WGET:= WITH_GNUTLS WITH_OPENSSL WITHOUT_SSL +PKG_CHOICES_WGET:= WITHOUT_SSL WITH_GNUTLS WITH_LIBRESSL WITH_OPENSSL PKGCD_WITHOUT_SSL:= use no ssl +PKGCD_WITH_LIBRESSL:= use libressl for crypto +PKGCS_WITH_LIBRESSL:= libressl ca-certificates libgmp +PKGCB_WITH_LIBRESSL:= libressl PKGCD_WITH_OPENSSL:= use openssl for crypto PKGCS_WITH_OPENSSL:= libopenssl ca-certificates libgmp PKGCB_WITH_OPENSSL:= openssl @@ -39,6 +42,11 @@ 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 \ + --with-libssl-prefix=${STAGING_TARGET_DIR} +endif ifeq (${ADK_PACKAGE_WGET_WITH_GNUTLS},y) CONFIGURE_ARGS+= --with-ssl=gnutls \ --with-libgnutls-prefix="$(STAGING_TARGET_DIR)/usr" -- cgit v1.2.3