diff options
| author |   Jens Rehsack <rehsack@gmail.com> | 2015-11-19 20:45:56 +0100 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2016-01-04 12:58:10 -0500 |
| commit | 60699c92e17ef124307aded87d8e9bfe55460d22 (patch) | |
| tree | 8487a0c03b6401e2a3562876b10e8977bfcacda1 /meta-networking | |
| parent | 9546714d2464b950e91d0eaf330865e482450113 (diff) | |
| download | meta-openembedded-60699c92e17ef124307aded87d8e9bfe55460d22.tar.gz | |
libldb: allow chosing ldap dependency instead of hard requiring it
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>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch | 13 | ||||
| -rw-r--r-- | meta-networking/recipes-support/libldb/libldb_1.1.17.bb | 6 |
2 files changed, 17 insertions, 2 deletions
diff --git a/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch b/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch new file mode 100644 index 0000000000..8ab094fa7e --- /dev/null +++ b/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch @@ -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 diff --git a/meta-networking/recipes-support/libldb/libldb_1.1.17.bb b/meta-networking/recipes-support/libldb/libldb_1.1.17.bb index e587858f53..2e708a5242 100644 --- a/meta-networking/recipes-support/libldb/libldb_1.1.17.bb +++ b/meta-networking/recipes-support/libldb/libldb_1.1.17.bb @@ -3,14 +3,16 @@ HOMEPAGE = "http://ldb.samba.org" SECTION = "libs" LICENSE = "LGPL-3.0+ & LGPL-2.1+ & GPL-3.0+" -DEPENDS += "libtdb libtalloc libtevent popt" -RDEPENDS_${PN} += "openldap" +DEPENDS += "libbsd libtdb libtalloc libtevent popt" RDEPENDS_pyldb += "python" SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ 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 \ file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ file://${COREBASE}/meta/files/common-licenses/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891" |