Sun Jan 29 21:43:56 2017 UTC ()
add sqlite3 to statically linked libraries for pam.


(christos)
diff -r1.300 -r1.301 src/share/mk/bsd.prog.mk
cvs diff -r1.300 -r1.301 src/share/mk/bsd.prog.mk (expand / switch to unified diff)

--- src/share/mk/bsd.prog.mk 2016/08/20 11:23:33 1.300
+++ src/share/mk/bsd.prog.mk 2017/01/29 21:43:56 1.301
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.prog.mk,v 1.300 2016/08/20 11:23:33 christos Exp $ 1# $NetBSD: bsd.prog.mk,v 1.301 2017/01/29 21:43:56 christos Exp $
2# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 2# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
3 3
4.ifndef HOSTPROG 4.ifndef HOSTPROG
5 5
6.include <bsd.init.mk> 6.include <bsd.init.mk>
7.include <bsd.shlib.mk> 7.include <bsd.shlib.mk>
8.include <bsd.gcc.mk> 8.include <bsd.gcc.mk>
9 9
10# 10#
11# Definitions and targets shared among all programs built by a single 11# Definitions and targets shared among all programs built by a single
12# Makefile. 12# Makefile.
13# 13#
14 14
@@ -210,29 +210,29 @@ LIBCRTI= ${DESTDIR}/usr/lib/${MLIBDIR:D$ @@ -210,29 +210,29 @@ LIBCRTI= ${DESTDIR}/usr/lib/${MLIBDIR:D$
210LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_lib:S/xx/++/:S/atf_c/atf-c/}.a 210LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_lib:S/xx/++/:S/atf_c/atf-c/}.a
211.MADE: ${LIB${_lib:tu}} # Note: ${DESTDIR} will be expanded 211.MADE: ${LIB${_lib:tu}} # Note: ${DESTDIR} will be expanded
212.endif 212.endif
213.endfor 213.endfor
214 214
215# PAM applications, if linked statically, need more libraries 215# PAM applications, if linked statically, need more libraries
216.if (${MKPIC} == "no") 216.if (${MKPIC} == "no")
217.if (${MKCRYPTO} != "no") 217.if (${MKCRYPTO} != "no")
218PAM_STATIC_LDADD+= -lssh 218PAM_STATIC_LDADD+= -lssh
219PAM_STATIC_DPADD+= ${LIBSSH} 219PAM_STATIC_DPADD+= ${LIBSSH}
220.endif 220.endif
221.if (${MKKERBEROS} != "no") 221.if (${MKKERBEROS} != "no")
222PAM_STATIC_LDADD+= -lkafs -lkrb5 -lhx509 -lwind -lasn1 \ 222PAM_STATIC_LDADD+= -lkafs -lkrb5 -lhx509 -lwind -lasn1 \
223 -lroken -lcom_err -lheimbase -lcrypto 223 -lroken -lcom_err -lheimbase -lcrypto -lsqlite3
224PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBWIND} ${LIBASN1} \ 224PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBWIND} ${LIBASN1} \
225 ${LIBROKEN} ${LIBCOM_ERR} ${LIBHEIMBASE} ${LIBCRYPTO} 225 ${LIBROKEN} ${LIBCOM_ERR} ${LIBHEIMBASE} ${LIBCRYPTO} ${LIBSQLITE3}
226.endif 226.endif
227.if (${MKSKEY} != "no") 227.if (${MKSKEY} != "no")
228PAM_STATIC_LDADD+= -lskey 228PAM_STATIC_LDADD+= -lskey
229PAM_STATIC_DPADD+= ${LIBSKEY} 229PAM_STATIC_DPADD+= ${LIBSKEY}
230.endif 230.endif
231PAM_STATIC_LDADD+= -lradius -lcrypt -lrpcsvc -lutil 231PAM_STATIC_LDADD+= -lradius -lcrypt -lrpcsvc -lutil
232PAM_STATIC_DPADD+= ${LIBRADIUS} ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL} 232PAM_STATIC_DPADD+= ${LIBRADIUS} ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL}
233.else 233.else
234PAM_STATIC_LDADD= 234PAM_STATIC_LDADD=
235PAM_STATIC_DPADD= 235PAM_STATIC_DPADD=
236.endif 236.endif
237 237
238# NB: If you are a library here, add it in bsd.README 238# NB: If you are a library here, add it in bsd.README