Author: ume
Date: Sat Jan 14 19:38:24 2012
New Revision: 230113
URL: http://svn.freebsd.org/changeset/base/230113
Log:
MFC r228284, r228308:
- Make heimdal buildable with WITH_OPENLDAP defined, again.
- Our heimdal uses the deprecated OpenLDAP functions.
- Don't support OpenLDAP during lib32 build.
Modified:
stable/9/kerberos5/Makefile.inc
stable/9/kerberos5/lib/libhdb/Makefile
Directory Properties:
stable/9/kerberos5/ (props changed)
Modified: stable/9/kerberos5/Makefile.inc
==============================================================================
--- stable/9/kerberos5/Makefile.inc Sat Jan 14 19:22:45 2012
(r230112)
+++ stable/9/kerberos5/Makefile.inc Sat Jan 14 19:38:24 2012
(r230113)
@@ -6,11 +6,11 @@ KRB5DIR= ${.CURDIR}/../../../crypto/heim
CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../../include
-.if defined(WITH_OPENLDAP)
+.if defined(WITH_OPENLDAP) && !defined(COMPAT_32BIT)
OPENLDAPBASE?= /usr/local
LDAPLDADD= -lldap -llber
LDAPDPADD= ${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;}
-LDAPCFLAGS= -I${OPENLDAPBASE}/include -DOPENLDAP=1
+LDAPCFLAGS= -I${OPENLDAPBASE}/include -DOPENLDAP=1 -DLDAP_DEPRECATED=1
LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib
.endif
Modified: stable/9/kerberos5/lib/libhdb/Makefile
==============================================================================
--- stable/9/kerberos5/lib/libhdb/Makefile Sat Jan 14 19:22:45 2012
(r230112)
+++ stable/9/kerberos5/lib/libhdb/Makefile Sat Jan 14 19:38:24 2012
(r230113)
@@ -1,9 +1,9 @@
# $FreeBSD$
LIB= hdb
-LDFLAGS= -Wl,--no-undefined
-LDADD= -lasn1 -lcom_err -lkrb5 -lroken
-DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN}
+LDFLAGS= -Wl,--no-undefined ${LDAPLDFLAGS}
+LDADD= -lasn1 -lcom_err -lkrb5 -lroken ${LDAPLDADD}
+DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} ${LDAPDPADD}
INCS= hdb-private.h \
hdb-protos.h \
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
