Date: Thu, 3 Sep 2015 11:33:34 +0000 (UTC) From: Hajimu UMEMOTO <ume@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r287428 - in stable/10/kerberos5: . lib/libhdb libexec/digest-service libexec/kdc usr.bin/string2key usr.sbin/iprop-log Message-ID: <201509031133.t83BXY45010556@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ume Date: Thu Sep 3 11:33:33 2015 New Revision: 287428 URL: https://svnweb.freebsd.org/changeset/base/287428 Log: MFC r287208, r287216: Make it buildable with WITH_OPENLDAP, again. Modified: stable/10/kerberos5/Makefile.inc stable/10/kerberos5/lib/libhdb/Makefile stable/10/kerberos5/libexec/digest-service/Makefile stable/10/kerberos5/libexec/kdc/Makefile stable/10/kerberos5/usr.bin/string2key/Makefile stable/10/kerberos5/usr.sbin/iprop-log/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/kerberos5/Makefile.inc ============================================================================== --- stable/10/kerberos5/Makefile.inc Thu Sep 3 11:31:34 2015 (r287427) +++ stable/10/kerberos5/Makefile.inc Thu Sep 3 11:33:33 2015 (r287428) @@ -11,7 +11,7 @@ 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 .endif LIBVERS= ${.OBJDIR}/../../lib/libvers/libvers.a Modified: stable/10/kerberos5/lib/libhdb/Makefile ============================================================================== --- stable/10/kerberos5/lib/libhdb/Makefile Thu Sep 3 11:31:34 2015 (r287427) +++ stable/10/kerberos5/lib/libhdb/Makefile Thu Sep 3 11:33:33 2015 (r287428) @@ -1,9 +1,9 @@ # $FreeBSD$ LIB= hdb -LDFLAGS= -Wl,--no-undefined +LDFLAGS= -Wl,--no-undefined ${LDAPLDFLAGS} VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map -LDADD= -lasn1 -lcom_err -lkrb5 -lroken -lheimsqlite +LDADD= -lasn1 -lcom_err -lkrb5 -lroken -lheimsqlite ${LDAPLDADD} DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} ${LIBHEIMSQLITE} ${LDAPDPADD} MAN= HDB.3 hdb_entry_ex.3 Modified: stable/10/kerberos5/libexec/digest-service/Makefile ============================================================================== --- stable/10/kerberos5/libexec/digest-service/Makefile Thu Sep 3 11:31:34 2015 (r287427) +++ stable/10/kerberos5/libexec/digest-service/Makefile Thu Sep 3 11:33:33 2015 (r287428) @@ -12,6 +12,7 @@ DPADD= ${LIBHDB} ${LIBKDC} ${LIBHEIMIPCS ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} LDADD= -lhdb -lkdc -lheimipcs -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \ ${LIBVERS} -lheimntlm +LDFLAGS=${LDAPLDFLAGS} USEPRIVATELIB= heimipcs .include <bsd.prog.mk> Modified: stable/10/kerberos5/libexec/kdc/Makefile ============================================================================== --- stable/10/kerberos5/libexec/kdc/Makefile Thu Sep 3 11:31:34 2015 (r287427) +++ stable/10/kerberos5/libexec/kdc/Makefile Thu Sep 3 11:33:33 2015 (r287428) @@ -13,6 +13,7 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DI DPADD= ${LIBKDC} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \ ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} LDADD= -lkdc -lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS} +LDFLAGS=${LDAPLDFLAGS} .include <bsd.prog.mk> Modified: stable/10/kerberos5/usr.bin/string2key/Makefile ============================================================================== --- stable/10/kerberos5/usr.bin/string2key/Makefile Thu Sep 3 11:31:34 2015 (r287427) +++ stable/10/kerberos5/usr.bin/string2key/Makefile Thu Sep 3 11:33:33 2015 (r287428) @@ -7,9 +7,9 @@ CFLAGS+= -I${KRB5DIR}/kdc \ -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/windc -DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ ${LIBCRYPT} ${LIBVERS} -LDADD= -lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS} +LDADD= -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS} .include <bsd.prog.mk> Modified: stable/10/kerberos5/usr.sbin/iprop-log/Makefile ============================================================================== --- stable/10/kerberos5/usr.sbin/iprop-log/Makefile Thu Sep 3 11:31:34 2015 (r287427) +++ stable/10/kerberos5/usr.sbin/iprop-log/Makefile Thu Sep 3 11:33:33 2015 (r287428) @@ -12,6 +12,7 @@ DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB ${LIBCRYPT} ${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBEDIT} LDADD= -lkadm5srv -lhdb -lkrb5 -lasn1 -lcrypto -lcrypt ${LIBSL} -lroken \ ${LIBVERS} -ledit +LDFLAGS=${LDAPLDFLAGS} iprop-commands.h: iprop-commands.in ${SLC} ${.ALLSRC:M*.in}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509031133.t83BXY45010556>