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/openldap/Makefile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'package/openldap') diff --git a/package/openldap/Makefile b/package/openldap/Makefile index cb24e0f05..be90bd601 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400 PKG_DESCR:= ldap client libraries PKG_SECTION:= libs/misc -PKG_DEPENDS:= libsasl2 libdb libuuid libncurses -PKG_BUILDDEP:= cyrus-sasl db util-linux +PKG_DEPENDS:= libsasl2 libdb libuuid libncurses libressl +PKG_BUILDDEP:= cyrus-sasl db util-linux libressl PKG_NEEDS:= threads c++ PKG_URL:= http://www.openldap.org/ PKG_SITES:= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ @@ -19,14 +19,6 @@ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz -PKG_CHOICES_CTORRENT:= WITH_LIBRESSL WITH_OPENSSL -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_SUBPKGS:= LIBOPENLDAP OPENLDAP_UTILS OPENLDAP_SLAPD PKGSD_OPENLDAP_UTILS:= ldap utilities PKGSS_OPENLDAP_UTILS:= libopenldap @@ -44,6 +36,7 @@ $(eval $(call PKG_template,LIBOPENLDAP,libopenldap,${PKG_VERSION}-${PKG_RELEASE} $(eval $(call PKG_template,OPENLDAP_UTILS,openldap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENLDAP_UTILS},${PKGSD_OPENLDAP_UTILS},${PKGSC_OPENLDAP_UTILS})) $(eval $(call PKG_template,OPENLDAP_SLAPD,openldap-slapd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENLDAP_SLAPD},${PKGSD_OPENLDAP_SLAPD},${PKGSC_OPENLDAP_SLAPD})) +CONFIGURE_ENV+= ac_cv_func_memcmp_working=yes CONFIGURE_ARGS+= --enable-slapd \ --libexecdir=/usr/sbin \ --enable-bdb \ @@ -65,7 +58,6 @@ else CONFIGURE_ARGS+= --disable-ipv6 endif -CONFIGURE_ENV+= ac_cv_func_memcmp_working=yes XAKE_FLAGS+= STRIP="" CPPFLAGS="-D_GNU_SOURCE" libopenldap-install: -- cgit v1.2.3