[src/trunk]: src Handle implicit library dependency for static builds:

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d23152b61d31
branches:  trunk
changeset: 765731:d23152b61d31
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Jun 04 02:08:50 2011 +0000

description:
Handle implicit library dependency for static builds:
 - libheimbase is required by libkrb5
 - libwind is required by libhx509

diffstat:

 crypto/external/bsd/openssh/bin/ssh/Makefile |   9 ++++++---
 external/gpl2/xcvs/bin/xcvs/Makefile         |  13 ++++++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diffs (59 lines):

diff -r 602a720e0f2a -r d23152b61d31 crypto/external/bsd/openssh/bin/ssh/Makefile
--- a/crypto/external/bsd/openssh/bin/ssh/Makefile      Sat Jun 04 02:03:31 2011 +0000
+++ b/crypto/external/bsd/openssh/bin/ssh/Makefile      Sat Jun 04 02:08:50 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2010/11/22 22:19:53 christos Exp $
+#      $NetBSD: Makefile,v 1.4 2011/06/04 02:08:50 tsutsui Exp $
 
 .include <bsd.own.mk>
 
@@ -25,8 +25,11 @@
 LDADD+=        -lgssapi -lheimntlm
 DPADD+=        ${LIBGSSAPI} ${LIBHEIMNTLM}
 
-LDADD+=        -lkrb5 -lhx509 -lkafs -lasn1 -lcrypt
-DPADD+=        ${LIBKRB5} ${LIBHX509} ${LIBKAFS} ${LIBASN1} ${LIBCRYPT}
+LDADD+=        -lkrb5 -lhx509 -lheimbase -lwind
+DPADD+=        ${LIBKRB5} ${LIBHX509} ${LIBHEIMBASE} ${LIBWIND}
+
+LDADD+=        -lkafs -lasn1 -lcrypt
+DPADD+=        ${LIBKAFS} ${LIBASN1} ${LIBCRYPT}
 
 LDADD+=        -lcom_err -lroken -lutil
 DPADD+=        ${LIBCOM_ERR} ${LIBROKEN} ${LIBUTIL}
diff -r 602a720e0f2a -r d23152b61d31 external/gpl2/xcvs/bin/xcvs/Makefile
--- a/external/gpl2/xcvs/bin/xcvs/Makefile      Sat Jun 04 02:03:31 2011 +0000
+++ b/external/gpl2/xcvs/bin/xcvs/Makefile      Sat Jun 04 02:08:50 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2010/12/18 04:23:26 joerg Exp $
+#      $NetBSD: Makefile,v 1.3 2011/06/04 02:08:50 tsutsui Exp $
 
 .include "${.CURDIR}/../../Makefile.inc"
 
@@ -34,9 +34,10 @@
 DPADD+= ${LIBHEIMNTLM}
 LDADD+= -lheimntlm
 
+# libheimbase is required by libkrb5
 # libhx509 is required by libkrb5
-DPADD+= ${LIBHX509}
-LDADD+= -lhx509
+DPADD+= ${LIBHEIMBASE} ${LIBHX509}
+LDADD+= -lheimbase -lhx509
 
 # libasn1 is required by all the above libs
 DPADD+= ${LIBASN1}
@@ -45,9 +46,11 @@
 # libcom_err is required by libasn1
 # libroken is required by libgssapi, libkrb5, libheimntlm, and libhx509
 # libcrypto is required by libgssapi, libkrb5, and libhx509
+# libwind is required by libhx509
 CPPFLAGS+= -DENCRYPTION
-DPADD+= ${LIBCOM_ERR} ${LIBROKEN} ${LIBCRYPTO}
-LDADD+= -lcom_err -lroken -lcrypto
+DPADD+= ${LIBCOM_ERR} ${LIBROKEN} ${LIBWIND} ${LIBCRYPTO}
+LDADD+= -lcom_err -lroken -lwind -lcrypto
+
 
 # libutil is required by libroken
 DPADD+= ${LIBUTIL}