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/xorg-server/Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'package/xorg-server/Makefile') diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 41c1e7746..9c2e59e61 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -31,16 +31,13 @@ PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_G PKG_FLAVOURS_XORG_SERVER:= WITH_KDRIVE PKGFD_WITH_KDRIVE:= build kdrive xfbdev server -PKG_CHOICES_XORG_SERVER:= WITH_GCRYPT WITH_LIBRESSL WITH_OPENSSL -PKGCD_WITH_GCRYPT:= use libgcrypt for sha1 -PKGCS_WITH_GCRYPT:= libgcrypt -PKGCB_WITH_GCRYPT:= libgcrypt +PKG_CHOICES_XORG_SERVER:= WITH_LIBRESSL WITH_GCRYPT PKGCD_WITH_LIBRESSL:= use libressl crypto for sha1 PKGCS_WITH_LIBRESSL:= libressl PKGCB_WITH_LIBRESSL:= libressl -PKGCD_WITH_OPENSSL:= use openssl crypto for sha1 -PKGCS_WITH_OPENSSL:= libopenssl -PKGCB_WITH_OPENSSL:= openssl +PKGCD_WITH_GCRYPT:= use libgcrypt for sha1 +PKGCS_WITH_GCRYPT:= libgcrypt +PKGCB_WITH_GCRYPT:= libgcrypt include $(ADK_TOPDIR)/mk/package.mk @@ -52,7 +49,7 @@ ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_GCRYPT},y) CONFIGURE_ARGS+= --with-sha1=libgcrypt endif -ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_CRYPTO},y) +ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_LIBRESSL},y) CONFIGURE_ARGS+= --with-sha1=libcrypto endif -- cgit v1.2.3