Date: Thu, 27 Aug 2015 15:03:35 +0000 (UTC) From: Hajimu UMEMOTO <ume@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287208 - in head/kerberos5: . lib/libhdb Message-ID: <201508271503.t7RF3ZYr098906@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ume Date: Thu Aug 27 15:03:34 2015 New Revision: 287208 URL: https://svnweb.freebsd.org/changeset/base/287208 Log: Make it buildable with WITH_OPENLDAP, again. MFC after: 1 week Modified: head/kerberos5/Makefile.inc head/kerberos5/lib/libhdb/Makefile Modified: head/kerberos5/Makefile.inc ============================================================================== --- head/kerberos5/Makefile.inc Thu Aug 27 14:07:28 2015 (r287207) +++ head/kerberos5/Makefile.inc Thu Aug 27 15:03:34 2015 (r287208) @@ -13,7 +13,8 @@ OPENLDAPBASE?= /usr/local LDAPLDADD= -lldap -llber LDAPDPADD= ${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;} LDAPCFLAGS= -I${OPENLDAPBASE}/include -DOPENLDAP=1 -DLDAP_DEPRECATED=1 -LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib +LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -rpath ${OPENLDAPBASE}/lib +LDFLAGS+= ${LDAPLDFLAGS} .endif .if defined(SRCS) Modified: head/kerberos5/lib/libhdb/Makefile ============================================================================== --- head/kerberos5/lib/libhdb/Makefile Thu Aug 27 14:07:28 2015 (r287207) +++ head/kerberos5/lib/libhdb/Makefile Thu Aug 27 15:03:34 2015 (r287208) @@ -1,9 +1,10 @@ # $FreeBSD$ LIB= hdb -LDFLAGS= -Wl,--no-undefined +LDFLAGS= -Wl,--no-undefined ${LDAPLDFLAGS} VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map LIBADD= asn1 com_err krb5 roken sqlite3 +LDADD= ${LDAPLDADD} DPADD= ${LDAPDPADD} MAN= HDB.3 hdb_entry_ex.3
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508271503.t7RF3ZYr098906>