From 26e2aca4359bc7cff080c8446a67b838a5026d15 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
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/socat/Makefile | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'package/socat')

diff --git a/package/socat/Makefile b/package/socat/Makefile
index 0f73b4673..55f32f8c6 100644
--- a/package/socat/Makefile
+++ b/package/socat/Makefile
@@ -15,10 +15,14 @@ PKG_SITES:=		http://www.dest-unreach.org/socat/download/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_FLAVOURS_SOCAT:=	WITH_SSL
-PKGFD_WITH_SSL:=	enable SSL support
-PKGFS_WITH_SSL:=	libopenssl
-PKGFB_WITH_SSL:=	openssl
+PKG_CHOICES_SOCAT:=	WITHOUT_SSL WITH_LIBRESSL WITH_OPENSSL
+PKGCD_WITHOUT_SSL:=	use no ssl
+PKGCD_WITH_LIBRESSL:=	use libressl for crypto
+PKGCB_WITH_LIBRESSL:=	libressl
+PKGCS_WITH_LIBRESSL:=	libressl
+PKGCD_WITH_OPENSSL:=	use openssl for crypto
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCS_WITH_OPENSSL:=	libopenssl
 
 include ${ADK_TOPDIR}/mk/package.mk
 
@@ -32,9 +36,13 @@ CONFIGURE_ENV+=		sc_cv_termios_ispeed=no \
 CONFIGURE_ARGS+=	--disable-libwrap \
 			--disable-readline
 
-ifneq (${ADK_PACKAGE_SOCAT_WITH_SSL},)
+ifeq (${ADK_PACKAGE_SOCAT_WITH_OPENSSL},y)
 CONFIGURE_ARGS+=	--enable-openssl
-else
+endif
+ifeq (${ADK_PACKAGE_SOCAT_WITH_LIBRESSL},y)
+CONFIGURE_ARGS+=	--enable-openssl
+endif
+ifeq (${ADK_PACKAGE_SOCAT_WITHOUT_SSL},y)
 CONFIGURE_ARGS+=	--disable-openssl
 endif
 
-- 
cgit v1.2.3