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/tntnet/Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'package/tntnet/Makefile') diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile index 40b2f993b..8ab264a62 100644 --- a/package/tntnet/Makefile +++ b/package/tntnet/Makefile @@ -16,12 +16,15 @@ PKG_SITES:= http://www.tntnet.org/download/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_CHOICES_TNTNET:= WITH_GNUTLS WITH_OPENSSL WITHOUT_SSL -PKGCD_WITHOUT_SSL:= use no SSL -PKGCD_WITH_OPENSSL:= use OpenSSL for crypto +PKG_CHOICES_TNTNET:= WITHOUT_SSL WITH_GNUTLS WITH_OPENSSL WITH_LIBRESSL +PKGCD_WITHOUT_SSL:= use no ssl +PKGCD_WITH_OPENSSL:= use openssl for crypto PKGCS_WITH_OPENSSL:= libopenssl PKGCB_WITH_OPENSSL:= openssl -PKGCD_WITH_GNUTLS:= use GnuTLS for crypto +PKGCD_WITH_OPENSSL:= use libressl for crypto +PKGCS_WITH_OPENSSL:= libressl +PKGCB_WITH_OPENSSL:= libressl +PKGCD_WITH_GNUTLS:= use gnutls for crypto PKGCS_WITH_GNUTLS:= libgnutls PKGCB_WITH_GNUTLS:= gnutls @@ -35,6 +38,9 @@ endif ifeq (${ADK_PACKAGE_TNTNET_WITH_OPENSSL},y) CONFIGURE_ARGS+= --with-ssl=openssl endif +ifeq (${ADK_PACKAGE_TNTNET_WITH_LIBRESSL},y) +CONFIGURE_ARGS+= --with-ssl=openssl +endif ifeq (${ADK_PACKAGE_TNTNET_WITH_GNUTLS},y) CONFIGURE_ARGS+= --with-ssl=gnutls endif -- cgit v1.2.3