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/links/Makefile | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'package/links') diff --git a/package/links/Makefile b/package/links/Makefile index 6b3ef3c03..682ae7a90 100644 --- a/package/links/Makefile +++ b/package/links/Makefile @@ -9,13 +9,22 @@ PKG_RELEASE:= 1 PKG_HASH:= 2ff4f4bfa5ee1d11d5e2eed39311824d65aa0610da63b22bf4b14793c8f48aa5 PKG_DESCR:= web browser with graphic support PKG_SECTION:= app/browser -PKG_DEPENDS:= libpng libjpeg-turbo libtiff gpm libopenssl -PKG_BUILDDEP:= openssl libpng libjpeg-turbo gpm +PKG_DEPENDS:= libpng libjpeg-turbo libtiff gpm +PKG_BUILDDEP:= libpng libjpeg-turbo gpm PKG_URL:= http://links.twibright.com/ PKG_SITES:= http://links.twibright.com/download/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_CHOICES_LINKS:= 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 + PKG_FLAVOURS_LINKS:= WITH_DIRECTFB PKGFD_WITH_DIRECTFB:= enable DirectFB video output support PKGFS_WITH_DIRECTFB:= directfb @@ -27,13 +36,18 @@ $(eval $(call PKG_template,LINKS,links,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN CONFIGURE_ARGS+= --enable-graphics \ --with-fb \ - --with-ssl \ --without-svgalib \ --without-libtiff \ --without-x \ --without-pmshell \ --without-atheos +ifeq (${ADK_PACKAGE_LINKS_WITHOUT_SSL},y) +CONFIGURE_ARGS+= --without-ssl +else +CONFIGURE_ARGS+= --with-ssl +endif + ifeq (${ADK_PACKAGE_LINKS_WITH_DIRECTFB},y) CONFIGURE_ARGS+= --with-directfb else -- cgit v1.2.3