summaryrefslogtreecommitdiff
path: root/package/xorg-server
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-09-28 19:04:37 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-09-30 21:18:09 +0200
commit4237c9d899a7e5dfb9d62644601bcbfa1574ab82 (patch)
treeccb7b6d3fe16110c0dbc0648ca5c7760ab6d2b31 /package/xorg-server
parentf9be3a73d76d5cf4f8b07cbbff925872927a1eaa (diff)
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.
Diffstat (limited to 'package/xorg-server')
-rw-r--r--package/xorg-server/Makefile13
1 files changed, 5 insertions, 8 deletions
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