From 4237c9d899a7e5dfb9d62644601bcbfa1574ab82 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 28 Sep 2016 19:04:37 +0200 Subject: remove OpenSSL support I thought some time about this, we have it in parallel some time and it have issues for allmodconfig builds. Anyway I have no fun doing openssl updates twice a week. We just can not support stunnel/ssltunnel anymore. For nodejs we use bundled openssl. I am an old OpenBSD geek anyway, so get rid of OpenSSL. --- package/wget/Makefile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'package/wget/Makefile') diff --git a/package/wget/Makefile b/package/wget/Makefile index 9ca6a2364..84d5990a6 100644 --- a/package/wget/Makefile +++ b/package/wget/Makefile @@ -16,17 +16,14 @@ PKG_BB:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_CHOICES_WGET:= WITHOUT_SSL WITH_GNUTLS WITH_LIBRESSL WITH_OPENSSL -PKGCD_WITHOUT_SSL:= use no ssl +PKG_CHOICES_WGET:= WITH_LIBRESSL WITH_GNUTLS WITHOUT_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 PKGCD_WITH_GNUTLS:= use gnutls for crypto PKGCS_WITH_GNUTLS:= libgnutls ca-certificates libgmp PKGCB_WITH_GNUTLS:= gnutls +PKGCD_WITHOUT_SSL:= use no ssl include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk @@ -37,11 +34,6 @@ $(eval $(call PKG_template,WGET,wget,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS 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 \ -- cgit v1.2.3