Module Name: src Committed By: riastradh Date: Wed Oct 11 14:08:26 UTC 2023
Modified Files: src/crypto/external/bsd/heimdal: Makefile.inc src/share/mk: bsd.prog.mk Log Message: heimdal: No need for -lm, was only added for -lsqlite3. PR lib/57406 XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/heimdal/Makefile.inc cvs rdiff -u -r1.346 -r1.347 src/share/mk/bsd.prog.mk 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.9 src/crypto/external/bsd/heimdal/Makefile.inc:1.10 --- src/crypto/external/bsd/heimdal/Makefile.inc:1.9 Wed Oct 11 12:34:42 2023 +++ src/crypto/external/bsd/heimdal/Makefile.inc Wed Oct 11 14:08:25 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.9 2023/10/11 12:34:42 riastradh Exp $ +# $NetBSD: Makefile.inc,v 1.10 2023/10/11 14:08:25 riastradh Exp $ HEIMBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/heimdal HEIMDIST= ${HEIMBASE}/dist @@ -22,8 +22,8 @@ DPLIBROKEN= roken ${HEIMBASE}/lib/librok DPLIBSL= sl ${HEIMBASE}/lib/libsl DPLIBVERS= vers ${HEIMBASE}/lib/libvers DPLIBWIND= wind ${HEIMBASE}/lib/libwind -KRB5LDADD= -lcrypto -lcrypt -lm -KRB5DPADD= ${LIBCRYPTO} ${LIBCRYPT} ${LIBM} +KRB5LDADD= -lcrypto -lcrypt +KRB5DPADD= ${LIBCRYPTO} ${LIBCRYPT} .if ${USETOOLS} != "yes" COMPILEETOBJ!= cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR} Index: src/share/mk/bsd.prog.mk diff -u src/share/mk/bsd.prog.mk:1.346 src/share/mk/bsd.prog.mk:1.347 --- src/share/mk/bsd.prog.mk:1.346 Wed Oct 11 14:08:17 2023 +++ src/share/mk/bsd.prog.mk Wed Oct 11 14:08:26 2023 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prog.mk,v 1.346 2023/10/11 14:08:17 riastradh Exp $ +# $NetBSD: bsd.prog.mk,v 1.347 2023/10/11 14:08:26 riastradh Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .ifndef HOSTPROG @@ -206,11 +206,11 @@ LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_ LIBKRB5_LDADD+= -lkrb5 -lcom_err \ -lhx509 -lcrypto -lasn1 \ -lwind -lheimbase -lcom_err -lroken \ - -lm -lcrypt -lutil + -lcrypt -lutil LIBKRB5_DPADD+= ${LIBKRB5} ${LIBCOM_ERR} \ ${LIBHX509} ${LIBCRYPTO} ${LIBASN1} \ ${LIBWIND} ${LIBHEIMBASE} ${LIBCOM_ERR} ${LIBROKEN} \ - ${LIBM} ${LIBCRYPT} ${LIBUTIL} + ${LIBCRYPT} ${LIBUTIL} LIBGSSAPI_LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD} LIBGSSAPI_DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM} ${LIBKRB5_DPADD} .endif