mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 16:27:27 +00:00
openldap: Remove libgcrypt dependency
Since OpenLDAP 2.5.0, it uses nettle instead of gcrypt.
Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit a5512ab272)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
committed by
Armin Kuster
parent
f2f81539dc
commit
6c63579af1
@@ -1,15 +0,0 @@
|
|||||||
From http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-nds/openldap/files/
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -1263,7 +1263,7 @@ if test $ol_link_tls = no ; then
|
|
||||||
ol_link_tls=yes
|
|
||||||
WITH_TLS_TYPE=gnutls
|
|
||||||
|
|
||||||
- TLS_LIBS="-lgnutls"
|
|
||||||
+ TLS_LIBS="-lgnutls -lgcrypt"
|
|
||||||
|
|
||||||
AC_DEFINE(HAVE_GNUTLS, 1,
|
|
||||||
[define if you have GNUtls])
|
|
||||||
@@ -15,7 +15,6 @@ SECTION = "libs"
|
|||||||
LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
|
LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
|
||||||
|
|
||||||
SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${BP}.tgz \
|
SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${BP}.tgz \
|
||||||
file://openldap-2.4.28-gnutls-gcrypt.patch \
|
|
||||||
file://use-urandom.patch \
|
file://use-urandom.patch \
|
||||||
file://initscript \
|
file://initscript \
|
||||||
file://slapd.service \
|
file://slapd.service \
|
||||||
@@ -51,7 +50,7 @@ PACKAGECONFIG ??= "asyncmeta gnutls modules \
|
|||||||
${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
|
${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
|
||||||
"
|
"
|
||||||
#--with-tls with TLS/SSL support auto|openssl|gnutls [auto]
|
#--with-tls with TLS/SSL support auto|openssl|gnutls [auto]
|
||||||
PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls libgcrypt"
|
PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls"
|
||||||
PACKAGECONFIG[openssl] = "--with-tls=openssl,,openssl"
|
PACKAGECONFIG[openssl] = "--with-tls=openssl,,openssl"
|
||||||
|
|
||||||
PACKAGECONFIG[sasl] = "--with-cyrus-sasl,--without-cyrus-sasl,cyrus-sasl"
|
PACKAGECONFIG[sasl] = "--with-cyrus-sasl,--without-cyrus-sasl,cyrus-sasl"
|
||||||
|
|||||||
Reference in New Issue
Block a user