Module Name: src
Committed By: christos
Date: Sat Apr 4 03:35:01 UTC 2020
Modified Files:
src/share/mk: bsd.prog.mk
Log Message:
Fix kerberos libraries order
To generate a diff of this commit:
cvs rdiff -u -r1.326 -r1.327 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/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.326 src/share/mk/bsd.prog.mk:1.327
--- src/share/mk/bsd.prog.mk:1.326 Fri Apr 3 21:35:22 2020
+++ src/share/mk/bsd.prog.mk Fri Apr 3 23:35:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.326 2020/04/04 01:35:22 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.327 2020/04/04 03:35:01 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -221,15 +221,17 @@ LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_
.endfor
.if (${MKKERBEROS} != "no")
-LIBKRB5_LDADD+= -lkrb5
-LIBKRB5_DPADD+= ${LIBKRB5}
+LIBKRB5_LDADD+= -lkrb5 -lcom_err
+LIBKRB5_DPADD+= ${LIBKRB5} ${LIBCOM_ERR}
# Kerberos5 applications, if linked statically, need more libraries
LIBKRB5_STATIC_LDADD+= \
- -lhx509 -lcrypto -lasn1 -lcom_err -lroken \
- -lwind -lheimbase -lsqlite3 -lcrypt -lutil
+ -lhx509 -lcrypto -lasn1 \
+ -lwind -lheimbase -lcom_err -lroken \
+ -lsqlite3 -lcrypt -lutil
LIBKRB5_STATIC_DPADD+= \
- ${LIBHX509} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} \
- ${LIBWIND} ${LIBHEIMBASE} ${LIBSQLITE3} ${LIBCRYPT} ${LIBUTIL}
+ ${LIBHX509} ${LIBCRYPTO} ${LIBASN1} \
+ ${LIBWIND} ${LIBHEIMBASE} ${LIBCOM_ERR} ${LIBROKEN} \
+ ${LIBSQLITE3} ${LIBCRYPT} ${LIBUTIL}
. if (${MKPIC} == "no")
LIBKRB5_LDADD+= ${LIBKRB5_STATIC_LDADD}
LIBKRB5_DPADD+= ${LIBKRB5_STATIC_DPADD}
