Module Name: src
Committed By: tsutsui
Date: Sat Jun 4 02:08:50 UTC 2011
Modified Files:
src/crypto/external/bsd/openssh/bin/ssh: Makefile
src/external/gpl2/xcvs/bin/xcvs: Makefile
Log Message:
Handle implicit library dependency for static builds:
- libheimbase is required by libkrb5
- libwind is required by libhx509
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/xcvs/bin/xcvs/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/openssh/bin/ssh/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.3 src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.4
--- src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.3 Mon Nov 22 22:19:53 2010
+++ src/crypto/external/bsd/openssh/bin/ssh/Makefile Sat Jun 4 02:08:50 2011
@@ -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}
Index: src/external/gpl2/xcvs/bin/xcvs/Makefile
diff -u src/external/gpl2/xcvs/bin/xcvs/Makefile:1.2 src/external/gpl2/xcvs/bin/xcvs/Makefile:1.3
--- src/external/gpl2/xcvs/bin/xcvs/Makefile:1.2 Sat Dec 18 04:23:26 2010
+++ src/external/gpl2/xcvs/bin/xcvs/Makefile Sat Jun 4 02:08:50 2011
@@ -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}
