helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

autofs: fails to compile with openldap disabled

Browse Source 
As of 5.0.6, it appears that changes were introduced so that if you
compile with openldap disabled and openldap headers are not available,
then autofs fails to build.

Since autofs no longer depends on openldap, remove the dependency.

Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
This commit is contained in:
Amy Fong 2013-01-18 12:13:32 -05:00 committed by Joe MacDonald
parent af502674e6
commit b7ff6ac09a
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
meta-networking/recipes-daemons/autofs/autofs-5.0.7/fix_disable_ldap.patch Normal file
View File

@ -0,0 +1,42 @@
autofs: fails to compile with openldap disabled
As of 5.0.6, it appears that changes were introduced so that
if you compile with openldap disabled and openldap headers are not
available, then autofs fails to build.
Upstream-Status: Pending
Signed-off-by: Amy Fong <amy.fong@windriver.com>
--
lookup_ldap.h | 4 ++++
1 file changed, 4 insertions(+)
---
include/lookup_ldap.h | 4 ++++
1 file changed, 4 insertions(+)
--- a/include/lookup_ldap.h
+++ b/include/lookup_ldap.h
@@ -1,7 +1,9 @@
#ifndef LOOKUP_LDAP_H
#define LOOKUP_LDAP_H
+#ifdef WITH_LDAP
#include <ldap.h>
+#endif
#ifdef WITH_SASL
#include <openssl/ssl.h>
@@ -109,10 +111,12 @@
#define LDAP_AUTH_USESIMPLE 0x0008
+#ifdef WITH_LDAP
/* lookup_ldap.c */
LDAP *init_ldap_connection(unsigned logopt, const char *uri, struct lookup_context *ctxt);
int unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt);
int authtype_requires_creds(const char *authtype);
+#endif
#ifdef WITH_SASL
/* cyrus-sasl.c */

5
meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
View File

@ -3,7 +3,9 @@ SECTION = "base"
LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
DEPENDS += "openldap libtirpc flex-native bison-native"
PR = "r1"
DEPENDS += "libtirpc flex-native bison-native"
inherit autotools
@ -31,6 +33,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.bz2 \
file://libtirpc.patch \
file://libtirpc-name-clash-backout.patch \
file://autofs-5.0.7-do-not-check-for-modprobe.patch \
file://fix_disable_ldap.patch \
"
SRC_URI[md5sum] = "bc46838dece83c02d800ff144ed9f431"