mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-27 07:57:27 +00:00
Code Issues Projects Releases Wiki Activity

libldb: allow chosing ldap dependency instead of hard requiring it

Browse Source 
Add a patch to remove the check for openldap but mark prove result negative unless
ldap dependency is enabled explicitely.

Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Jens Rehsack
2015-11-19 20:45:56 +01:00
committed by Joe MacDonald
parent 9546714d24
commit 60699c92e1
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch
+13
View File
@@ -0,0 +1,13 @@
--- a/wscript 2015-11-18 12:43:33.000000000 +0100
+++ b/wscript 2015-11-18 12:46:25.000000000 +0100
@@ -58,9 +58,7 @@
if conf.env.standalone_ldb:
conf.CHECK_XSLTPROC_MANPAGES()
- # we need this for the ldap backend
- if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
- conf.env.ENABLE_LDAP_BACKEND = True
+ conf.env.ENABLE_LDAP_BACKEND = False
# we don't want any libraries or modules to rely on runtime
# resolution of symbols
meta-networking/recipes-support/libldb/libldb_1.1.17.bb
+4 -2
View File
@@ -3,14 +3,16 @@ HOMEPAGE = "http://ldb.samba.org"
SECTION = "libs" SECTION = "libs"
LICENSE = "LGPL-3.0+ & LGPL-2.1+ & GPL-3.0+" LICENSE = "LGPL-3.0+ & LGPL-2.1+ & GPL-3.0+"
DEPENDS += "libtdb libtalloc libtevent popt" DEPENDS += "libbsd libtdb libtalloc libtevent popt"
RDEPENDS_${PN} += "openldap"
RDEPENDS_pyldb += "python" RDEPENDS_pyldb += "python"
SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \
file://do-not-import-target-module-while-cross-compile.patch \ file://do-not-import-target-module-while-cross-compile.patch \
" "
PACKAGECONFIG[ldap] = ",,openldap"
SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'ldap', '', 'file://avoid-openldap-unless-wanted.patch', d)}"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
file://${COREBASE}/meta/files/common-licenses/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891" file://${COREBASE}/meta/files/common-licenses/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891"