Module Name: src
Committed By: christos
Date: Sat Apr 4 13:33:14 UTC 2020
Modified Files:
src/share/mk: bsd.prog.mk
Log Message:
Linker semantics have changed; we now don't automatically link dependent
libraries from other DSO's. For example in /usr/bin/passwd:
ld: krb5_passwd.o: undefined reference to symbol \
'UI_UTIL_read_pw_string@@OPENSSL_1_1_0'
ld: /usr/obj/amd64-x86_64/release/lib/libcrypto.so.14: error adding symbols: \
DSO missing from command line
To generate a diff of this commit:
cvs rdiff -u -r1.327 -r1.328 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.327 src/share/mk/bsd.prog.mk:1.328
--- src/share/mk/bsd.prog.mk:1.327 Fri Apr 3 23:35:01 2020
+++ src/share/mk/bsd.prog.mk Sat Apr 4 09:33:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.327 2020/04/04 03:35:01 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.328 2020/04/04 13:33:14 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -221,21 +221,15 @@ LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_
.endfor
.if (${MKKERBEROS} != "no")
-LIBKRB5_LDADD+= -lkrb5 -lcom_err
-LIBKRB5_DPADD+= ${LIBKRB5} ${LIBCOM_ERR}
-# Kerberos5 applications, if linked statically, need more libraries
-LIBKRB5_STATIC_LDADD+= \
+# Kerberos5 applications
+LIBKRB5_LDADD+= -lkrb5 -lcom_err \
-lhx509 -lcrypto -lasn1 \
-lwind -lheimbase -lcom_err -lroken \
-lsqlite3 -lcrypt -lutil
-LIBKRB5_STATIC_DPADD+= \
+LIBKRB5_DPADD+= ${LIBKRB5} ${LIBCOM_ERR} \
${LIBHX509} ${LIBCRYPTO} ${LIBASN1} \
${LIBWIND} ${LIBHEIMBASE} ${LIBCOM_ERR} ${LIBROKEN} \
${LIBSQLITE3} ${LIBCRYPT} ${LIBUTIL}
-. if (${MKPIC} == "no")
-LIBKRB5_LDADD+= ${LIBKRB5_STATIC_LDADD}
-LIBKRB5_DPADD+= ${LIBKRB5_STATIC_DPADD}
-. endif
.endif
# PAM applications, if linked statically, need more libraries
