summaryrefslogtreecommitdiffstats
path: root/kerberos5
diff options
context:
space:
mode:
authorume <ume@FreeBSD.org>2015-09-03 11:33:33 +0000
committerume <ume@FreeBSD.org>2015-09-03 11:33:33 +0000
commita22a5bc3946dde8acd5f4c84d749ac806797ab60 (patch)
treec3cd0ecfeeed01df55b1d493e0af1bb3249dfbd2 /kerberos5
parent88feb84264586b144d11f4049848eef880342f6a (diff)
downloadFreeBSD-src-a22a5bc3946dde8acd5f4c84d749ac806797ab60.zip
FreeBSD-src-a22a5bc3946dde8acd5f4c84d749ac806797ab60.tar.gz
MFC r287208, r287216:
Make it buildable with WITH_OPENLDAP, again.
Diffstat (limited to 'kerberos5')
-rw-r--r--kerberos5/Makefile.inc2
-rw-r--r--kerberos5/lib/libhdb/Makefile4
-rw-r--r--kerberos5/libexec/digest-service/Makefile1
-rw-r--r--kerberos5/libexec/kdc/Makefile1
-rw-r--r--kerberos5/usr.bin/string2key/Makefile4
-rw-r--r--kerberos5/usr.sbin/iprop-log/Makefile1
6 files changed, 8 insertions, 5 deletions
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index 79355dd..c59c332 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -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
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index b7a51da..82f150c 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -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
diff --git a/kerberos5/libexec/digest-service/Makefile b/kerberos5/libexec/digest-service/Makefile
index 72f7125..dfecba7 100644
--- a/kerberos5/libexec/digest-service/Makefile
+++ b/kerberos5/libexec/digest-service/Makefile
@@ -12,6 +12,7 @@ DPADD= ${LIBHDB} ${LIBKDC} ${LIBHEIMIPCS} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
LDADD= -lhdb -lkdc -lheimipcs -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
${LIBVERS} -lheimntlm
+LDFLAGS=${LDAPLDFLAGS}
USEPRIVATELIB= heimipcs
.include <bsd.prog.mk>
diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile
index 4ca5c3a..afb6af5 100644
--- a/kerberos5/libexec/kdc/Makefile
+++ b/kerberos5/libexec/kdc/Makefile
@@ -13,6 +13,7 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
DPADD= ${LIBKDC} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
LDADD= -lkdc -lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
+LDFLAGS=${LDAPLDFLAGS}
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/string2key/Makefile b/kerberos5/usr.bin/string2key/Makefile
index fc790e2..abcbe88 100644
--- a/kerberos5/usr.bin/string2key/Makefile
+++ b/kerberos5/usr.bin/string2key/Makefile
@@ -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>
diff --git a/kerberos5/usr.sbin/iprop-log/Makefile b/kerberos5/usr.sbin/iprop-log/Makefile
index 176012a..b5b29e2 100644
--- a/kerberos5/usr.sbin/iprop-log/Makefile
+++ b/kerberos5/usr.sbin/iprop-log/Makefile
@@ -12,6 +12,7 @@ DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} \
${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}
OpenPOWER on IntegriCloud