Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Describe libpthread dependency correctly and put bind libs in list of 

dependent libs after .WAIT barrier in lib/Makefile.  Fixed build lossage
pointed out by smb.
This commit is contained in:
tls 2007-11-05 04:58:52 +00:00
parent 1a3f8bd1d1
commit 6c2ee7b76e
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.118 2007/11/04 23:28:17 tls Exp $
# $NetBSD: Makefile,v 1.119 2007/11/05 04:58:52 tls Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@ -10,12 +10,6 @@ SUBDIR= csu libc .WAIT libarch libbsdmalloc libbluetooth libbz2 \
libpthread_dbg libpuffs libresolv librmt librpcsvc librt libsdp \
libterm libusbhid libutil libwrap liby libz
# XXX These bind9/ISC libraries should depend on each other but the
# XXX dependency ordering requires considerable investigation.
# XXX Please preserve the order below so we know the order ISC links
# XXX them in in their Makefiles.
SUBDIR+= libbind9 libdns liblwres libisccfg libisccc libisc
.if (${MKSKEY} != "no")
SUBDIR+= libskey
.endif
@ -87,6 +81,12 @@ SUBDIR+= libkrb5 # depends on libcrypto and more
SUBDIR+= librefuse # depends on libpuffs
.endif
# XXX These bind9/ISC libraries should depend on each other but the
# XXX dependency ordering requires considerable investigation.
# XXX Please preserve the order below so we know the order ISC links
# XXX them in in their Makefiles.
SUBDIR+= libbind9 libdns liblwres libisccfg libisccc libisc # dep. libpthread
#==================== 2nd library dependency barrier ====================
SUBDIR+= .WAIT

8
usr.sbin/bind/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.29 2007/11/04 23:28:20 tls Exp $
# $NetBSD: Makefile.inc,v 1.30 2007/11/05 04:58:52 tls Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@ -59,8 +59,12 @@ CPPFLAGS+= -DLIBINTERFACE=${LIBINTERFACE} \
.endif
.if ${NAMED_USE_PTHREADS} == "yes"
.if !defined (LIB) || empty(LIB)
LDADD+= -lpthread
DPADD+= ${LIBPTHREAD} # XXX defined in bsd.prog.mk doesn't work for src/lib
DPADD+= ${LIBPTHREAD}
.else
LIBDPLIBS+= pthread ${.CURDIR}/../libpthread
.endif
.endif
.if ${NAMED_USE_OPENSSL} == "yes"