Module Name: src Committed By: riastradh Date: Thu Oct 12 17:18:39 UTC 2023
Modified Files: src/crypto/external/bsd/heimdal: Makefile.inc src/crypto/external/bsd/heimdal/libexec/digest-service: Makefile src/crypto/external/bsd/heimdal/libexec/hpropd: Makefile src/crypto/external/bsd/heimdal/libexec/ipropd-master: Makefile src/crypto/external/bsd/heimdal/libexec/ipropd-slave: Makefile src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile src/crypto/external/bsd/heimdal/libexec/kpasswdd: Makefile src/crypto/external/bsd/heimdal/sbin/hprop: Makefile src/crypto/external/bsd/heimdal/sbin/iprop-log: Makefile src/crypto/external/bsd/heimdal/sbin/kadmin: Makefile src/crypto/external/bsd/heimdal/sbin/kdc: Makefile src/crypto/external/bsd/heimdal/sbin/kstash: Makefile Log Message: heimdal: Make sure whatever uses libhdb also gets libsqlite3 & libm. Loose ends for static builds in the fix for PR lib/57406. XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/heimdal/Makefile.inc cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/crypto/external/bsd/heimdal/Makefile.inc diff -u src/crypto/external/bsd/heimdal/Makefile.inc:1.10 src/crypto/external/bsd/heimdal/Makefile.inc:1.11 --- src/crypto/external/bsd/heimdal/Makefile.inc:1.10 Wed Oct 11 14:08:25 2023 +++ src/crypto/external/bsd/heimdal/Makefile.inc Thu Oct 12 17:18:38 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.10 2023/10/11 14:08:25 riastradh Exp $ +# $NetBSD: Makefile.inc,v 1.11 2023/10/12 17:18:38 riastradh Exp $ HEIMBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/heimdal HEIMDIST= ${HEIMBASE}/dist @@ -24,6 +24,8 @@ DPLIBVERS= vers ${HEIMBASE}/lib/libvers DPLIBWIND= wind ${HEIMBASE}/lib/libwind KRB5LDADD= -lcrypto -lcrypt KRB5DPADD= ${LIBCRYPTO} ${LIBCRYPT} +HDBLDADD= -lsqlite3 -lm +HDBDPADD= ${LIBSQLITE3} ${LIBM} .if ${USETOOLS} != "yes" COMPILEETOBJ!= cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR} Index: src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile diff -u src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.5 src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.6 --- src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.5 Thu Jun 22 22:39:37 2023 +++ src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile Thu Oct 12 17:18:38 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:37 christos Exp $ +# $NetBSD: Makefile,v 1.6 2023/10/12 17:18:38 riastradh Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -19,5 +19,5 @@ PROGDPLIBS+= ${DPLIBKDC} ${DPLIBHDB} ${D .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> -LDADD+= ${KRB5LDADD} -DPADD+= ${KRB5DPADD} +LDADD+= ${KRB5LDADD} ${HDBLDADD} +DPADD+= ${KRB5DPADD} ${HDBDPADD} Index: src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile diff -u src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.5 src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.6 --- src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.5 Thu Jun 22 22:39:37 2023 +++ src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile Thu Oct 12 17:18:38 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:37 christos Exp $ +# $NetBSD: Makefile,v 1.6 2023/10/12 17:18:38 riastradh Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -19,5 +19,5 @@ PROGDPLIBS+= ${DPLIBHDB} .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> -LDADD+= ${KRB5LDADD} -DPADD+= ${KRB5DPADD} +LDADD+= ${KRB5LDADD} ${HDBLDADD} +DPADD+= ${KRB5DPADD} ${HDBDPADD} Index: src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile diff -u src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.5 src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.6 --- src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.5 Thu Jun 22 22:39:37 2023 +++ src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile Thu Oct 12 17:18:38 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:37 christos Exp $ +# $NetBSD: Makefile,v 1.6 2023/10/12 17:18:38 riastradh Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -25,5 +25,5 @@ PROGDPLIBS+= ${DPLIBKADM5SRV} ${DPLIBHDB .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> -LDADD+= -lutil ${KRB5LDADD} -DPADD+= ${LIBUTIL} ${KRB5DPADD} +LDADD+= -lutil ${KRB5LDADD} ${HDBLDADD} +DPADD+= ${LIBUTIL} ${KRB5DPADD} ${HDBDPADD} Index: src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile diff -u src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile:1.5 src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile:1.6 --- src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile:1.5 Thu Jun 22 22:39:37 2023 +++ src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile Thu Oct 12 17:18:38 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:37 christos Exp $ +# $NetBSD: Makefile,v 1.6 2023/10/12 17:18:38 riastradh Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -22,5 +22,5 @@ PROGDPLIBS+= ${DPLIBKADM5SRV} ${DPLIBHDB .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> -LDADD+= -lutil ${KRB5LDADD} -DPADD+= ${LIBUTIL} ${KRB5DPADD} +LDADD+= -lutil ${KRB5LDADD} ${HDBLDADD} +DPADD+= ${LIBUTIL} ${KRB5DPADD} ${HDBDPADD} Index: src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile diff -u src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.7 src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.8 --- src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.7 Thu Jun 22 22:39:37 2023 +++ src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile Thu Oct 12 17:18:38 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2023/06/22 22:39:37 christos Exp $ +# $NetBSD: Makefile,v 1.8 2023/10/12 17:18:38 riastradh Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -23,5 +23,5 @@ PROGDPLIBS+= ${DPLIBGSSAPI} ${DPLIBKADM5 .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> -LDADD+= -lutil ${KRB5LDADD} -DPADD+= ${LIBUTIL} ${KRB5DPADD} +LDADD+= -lutil ${KRB5LDADD} ${HDBLDADD} +DPADD+= ${LIBUTIL} ${KRB5DPADD} ${HDBDPADD} Index: src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile diff -u src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile:1.5 src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile:1.6 --- src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile:1.5 Thu Jun 22 22:39:38 2023 +++ src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile Thu Oct 12 17:18:38 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:38 christos Exp $ +# $NetBSD: Makefile,v 1.6 2023/10/12 17:18:38 riastradh Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -17,5 +17,5 @@ PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKADM5SR .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> -LDADD+= -lutil ${KRB5LDADD} -DPADD+= ${LIBUTIL} ${KRB5DPADD} +LDADD+= -lutil ${KRB5LDADD} ${HDBLDADD} +DPADD+= ${LIBUTIL} ${KRB5DPADD} ${HDBDPADD} Index: src/crypto/external/bsd/heimdal/sbin/hprop/Makefile diff -u src/crypto/external/bsd/heimdal/sbin/hprop/Makefile:1.5 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile:1.6 --- src/crypto/external/bsd/heimdal/sbin/hprop/Makefile:1.5 Thu Jun 22 22:39:38 2023 +++ src/crypto/external/bsd/heimdal/sbin/hprop/Makefile Thu Oct 12 17:18:39 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:38 christos Exp $ +# $NetBSD: Makefile,v 1.6 2023/10/12 17:18:39 riastradh Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -25,5 +25,5 @@ PROGDPLIBS+= ${DPLIBHDB} .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> -LDADD+= -lutil ${KRB5LDADD} -DPADD+= ${LIBUTIL} ${KRB5DPADD} +LDADD+= -lutil ${KRB5LDADD} ${HDBLDADD} +DPADD+= ${LIBUTIL} ${KRB5DPADD} ${HDBDPADD} Index: src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile diff -u src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile:1.5 src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile:1.6 --- src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile:1.5 Thu Jun 22 22:39:38 2023 +++ src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile Thu Oct 12 17:18:39 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:38 christos Exp $ +# $NetBSD: Makefile,v 1.6 2023/10/12 17:18:39 riastradh Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -17,5 +17,5 @@ PROGDPLIBS += ${DPLIBKADM5SRV} ${DPLIBHD .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> -LDADD+= -ledit -lterminfo ${KRB5LDADD} -DPADD+= ${LIBEDIT} ${LIBTERMINFO} ${KRB5DPADD} +LDADD+= -ledit -lterminfo ${KRB5LDADD} ${HDBLDADD} +DPADD+= ${LIBEDIT} ${LIBTERMINFO} ${KRB5DPADD} ${HDBDPADD} Index: src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile diff -u src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile:1.6 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile:1.7 --- src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile:1.6 Thu Jun 22 22:39:38 2023 +++ src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile Thu Oct 12 17:18:39 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2023/06/22 22:39:38 christos Exp $ +# $NetBSD: Makefile,v 1.7 2023/10/12 17:18:39 riastradh Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -49,5 +49,5 @@ CLEANFILES+=kadmin.8 .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> -LDADD+= -lutil -ledit -lterminfo ${KRB5LDADD} -DPADD+= ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO} ${KRB5DPADD} +LDADD+= -lutil -ledit -lterminfo ${KRB5LDADD} ${HDBLDADD} +DPADD+= ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO} ${KRB5DPADD} ${HDBDPADD} Index: src/crypto/external/bsd/heimdal/sbin/kdc/Makefile diff -u src/crypto/external/bsd/heimdal/sbin/kdc/Makefile:1.5 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile:1.6 --- src/crypto/external/bsd/heimdal/sbin/kdc/Makefile:1.5 Thu Jun 22 22:39:38 2023 +++ src/crypto/external/bsd/heimdal/sbin/kdc/Makefile Thu Oct 12 17:18:39 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:38 christos Exp $ +# $NetBSD: Makefile,v 1.6 2023/10/12 17:18:39 riastradh Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -26,5 +26,5 @@ MAN= kdc.8 .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> -LDADD+= -lutil ${KRB5LDADD} -DPADD+= ${LIBUTIL} ${KRB5DPADD} +LDADD+= -lutil ${KRB5LDADD} ${HDBLDADD} +DPADD+= ${LIBUTIL} ${KRB5DPADD} ${HDBDPADD} Index: src/crypto/external/bsd/heimdal/sbin/kstash/Makefile diff -u src/crypto/external/bsd/heimdal/sbin/kstash/Makefile:1.5 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile:1.6 --- src/crypto/external/bsd/heimdal/sbin/kstash/Makefile:1.5 Thu Jun 22 22:39:39 2023 +++ src/crypto/external/bsd/heimdal/sbin/kstash/Makefile Thu Oct 12 17:18:39 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:39 christos Exp $ +# $NetBSD: Makefile,v 1.6 2023/10/12 17:18:39 riastradh Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -27,5 +27,5 @@ PROGDPLIBS+= ${DPLIBHDB} .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> -LDADD+=${KRB5LDADD} -DPADD+=${KRB5DPADD} +LDADD+=${KRB5LDADD} ${HDBLDADD} +DPADD+=${KRB5DPADD} ${HDBDPADD}