Module Name: src
Committed By: tsutsui
Date: Sun Aug 11 14:42:04 UTC 2013
Modified Files:
src/external/bsd/bind: Makefile.inc
src/external/bsd/dhcp: Makefile.inc
Log Message:
List all required libraries by libgssapi and libkrb5 for NOPIC builds.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/bind/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcp/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.15 src/external/bsd/bind/Makefile.inc:1.16
--- src/external/bsd/bind/Makefile.inc:1.15 Mon Jul 29 16:42:20 2013
+++ src/external/bsd/bind/Makefile.inc Sun Aug 11 14:42:04 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.15 2013/07/29 16:42:20 dholland Exp $
+# $NetBSD: Makefile.inc,v 1.16 2013/08/11 14:42:04 tsutsui Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -94,12 +94,14 @@ CPPFLAGS+=-DOPENSSL -DUSE_ISC_SPNEGO
CPPFLAGS+=-DGSSAPI
.endif
.if ${MKKERBEROS} != "no"
-LDADD+= -lgssapi -lkrb5
-DPADD+= ${LIBGSSAPI} ${LIBKRB5}
+LDADD+= -lgssapi -lkrb5 -lhx509 -lheimntlm -lheimbase \
+ -lcom_err -lroken -lasn1 -lwind
+DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBHEIMBASE} \
+ ${LIBCOM_ERR} ${LIBROKEN} ${LIBASN1} ${LIBWIND}
.endif
.if !defined (LIB) || empty(LIB)
-LDADD+= -lcrypto
-DPADD+= ${LIBCRYPTO}
+LDADD+= -lcrypto -lcrypt
+DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
.else
.if exists(${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto)
LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
Index: src/external/bsd/dhcp/Makefile.inc
diff -u src/external/bsd/dhcp/Makefile.inc:1.6 src/external/bsd/dhcp/Makefile.inc:1.7
--- src/external/bsd/dhcp/Makefile.inc:1.6 Mon Jul 29 16:42:20 2013
+++ src/external/bsd/dhcp/Makefile.inc Sun Aug 11 14:42:04 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2013/07/29 16:42:20 dholland Exp $
+# $NetBSD: Makefile.inc,v 1.7 2013/08/11 14:42:04 tsutsui Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -41,11 +41,13 @@ LDADD+=-Wl,-Bdynamic
.endif
.if (${MKCRYPTO} != "no")
.if (${MKKERBEROS} != "no")
-LDADD+= -lgssapi -lkrb5
-DPADD+= ${LIBGSSAPI} ${LIBKRB5}
+LDADD+= -lgssapi -lkrb5 -lhx509 -lheimntlm -lheimbase \
+ -lcom_err -lroken -lasn1 -lwind
+DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBHEIMBASE} \
+ ${LIBCOM_ERR} ${LIBROKEN} ${LIBASN1} ${LIBWIND}
.endif
-LDADD+= -lcrypto -lipsec
-DPADD+= ${LIBCRYPTO} ${LIBIPSEC}
+LDADD+= -lcrypto -lipsec -lcrypt
+DPADD+= ${LIBCRYPTO} ${LIBIPSEC} ${LIBCRYPT}
.endif
DPADD+= ${COBJDIR}/libdhcp.a
DPADD+= ${OMOBJDIR}/libomapi.a ${DSTOBJDIR}/libdst.a
