diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bind/bind/Makefile | 3 | ||||
-rw-r--r-- | lib/bind/bind9/Makefile | 4 | ||||
-rw-r--r-- | lib/bind/config.mk | 17 | ||||
-rw-r--r-- | lib/bind/dns/Makefile | 16 | ||||
-rw-r--r-- | lib/bind/isc/Makefile | 25 | ||||
-rw-r--r-- | lib/bind/isccc/Makefile | 4 | ||||
-rw-r--r-- | lib/bind/isccfg/Makefile | 9 | ||||
-rw-r--r-- | lib/bind/lwres/Makefile | 4 |
8 files changed, 64 insertions, 18 deletions
diff --git a/lib/bind/bind/Makefile b/lib/bind/bind/Makefile index c10025c..ed32090 100644 --- a/lib/bind/bind/Makefile +++ b/lib/bind/bind/Makefile @@ -64,6 +64,9 @@ SRCS+= herror.c res_comp.c res_data.c \ res_mkquery.c res_mkupdate.c res_query.c \ res_send.c res_sendsigned.c res_update.c +DPADD= ${PTHREAD_DPADD} +LDADD= ${PTHREAD_LDADD} + #.if ${MK_BIND_LIBS} != "no" #INCS= ${SRCDIR}/include/isc/assertions.h \ # ${SRCDIR}/include/isc/ctl.h \ diff --git a/lib/bind/bind9/Makefile b/lib/bind/bind9/Makefile index 68f72d7..5abbeb1 100644 --- a/lib/bind/bind9/Makefile +++ b/lib/bind/bind9/Makefile @@ -15,6 +15,10 @@ LIB= bind9 SRCS= check.c getaddresses.c version.c CFLAGS+= -I${SRCDIR}/include +CFLAGS+= -I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include + +DPADD= ${PTHREAD_DPADD} +LDADD= ${PTHREAD_LDADD} .if ${MK_BIND_LIBS} != "no" INCS= ${SRCDIR}/include/bind9/check.h \ diff --git a/lib/bind/config.mk b/lib/bind/config.mk index d89207b..d47194b 100644 --- a/lib/bind/config.mk +++ b/lib/bind/config.mk @@ -62,6 +62,17 @@ CFLAGS+= -DRNDC_KEYFILE='"${SYSCONFDIR}/rndc.key"' CFLAGS+= -I${LIB_BIND_DIR} .endif +# Use the right version of the atomic.h file from lib/isc +.if ${MACHINE_ARCH} == "amd64" +ISC_ATOMIC_ARCH= x86_64 +.elif ${MACHINE_ARCH} == "arm" +ISC_ATOMIC_ARCH= mips +.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "i386/pc98" +ISC_ATOMIC_ARCH= x86_32 +.else +ISC_ATOMIC_ARCH= ${MACHINE_ARCH} +.endif + # Link against BIND libraries .if ${MK_BIND_LIBS} == "no" LIBBIND9= ${LIB_BIND_REL}/bind9/libbind9.a @@ -76,7 +87,7 @@ LIBISCCFG= ${LIB_BIND_REL}/isccfg/libisccfg.a CFLAGS+= -I${BIND_DIR}/lib/isccfg/include LIBISC= ${LIB_BIND_REL}/isc/libisc.a CFLAGS+= -I${BIND_DIR}/lib/isc/unix/include \ - -I${BIND_DIR}/lib/isc/nothreads/include \ + -I${BIND_DIR}/lib/isc/pthreads/include \ -I${BIND_DIR}/lib/isc/include \ -I${LIB_BIND_DIR}/isc LIBLWRES= ${LIB_BIND_REL}/lwres/liblwres.a @@ -97,3 +108,7 @@ BIND_LDADD= ${BIND_DPADD} CRYPTO_DPADD= ${LIBCRYPTO} CRYPTO_LDADD= -lcrypto .endif + +PTHREAD_DPADD= ${LIBPTHREAD} +PTHREAD_LDADD= -lpthread + diff --git a/lib/bind/dns/Makefile b/lib/bind/dns/Makefile index 04be449..6850098 100644 --- a/lib/bind/dns/Makefile +++ b/lib/bind/dns/Makefile @@ -12,10 +12,10 @@ SRCDIR= ${BIND_DIR}/lib/dns LIB= dns .PATH: ${SRCDIR} -SRCS+= acl.c adb.c byaddr.c \ +SRCS+= acache.c acl.c adb.c byaddr.c \ cache.c callbacks.c compress.c \ db.c dbiterator.c dbtable.c diff.c dispatch.c \ - dnssec.c ds.c \ + dlz.c dnssec.c ds.c \ dst_api.c dst_lib.c dst_parse.c dst_result.c \ forward.c \ gssapi_link.c gssapictx.c hmac_link.c \ @@ -31,19 +31,21 @@ SRCS+= acl.c adb.c byaddr.c \ rbt.c rbtdb.c rbtdb64.c rcode.c rdata.c \ rdatalist.c \ rdataset.c rdatasetiter.c rdataslab.c request.c \ - resolver.c result.c rootns.c sdb.c soa.c ssu.c \ + resolver.c result.c rootns.c sdb.c sdlz.c soa.c ssu.c \ stats.c tcpmsg.c time.c timer.c tkey.c \ tsig.c ttl.c validator.c \ version.c view.c xfrin.c zone.c zonekey.c zt.c CFLAGS+= -I${SRCDIR}/include/dst -I${SRCDIR}/include -I${SRCDIR} CFLAGS+= -I${.CURDIR} +CFLAGS+= -I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include -DPADD= ${CRYPTO_DPADD} -LDADD= ${CRYPTO_LDADD} +DPADD= ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD= ${CRYPTO_LDADD} ${PTHREAD_LDADD} .if ${MK_BIND_LIBS} != "no" -DNSINCS= ${SRCDIR}/include/dns/acl.h \ +DNSINCS= ${SRCDIR}/include/dns/acache.h \ + ${SRCDIR}/include/dns/acl.h \ ${SRCDIR}/include/dns/adb.h \ ${SRCDIR}/include/dns/bit.h \ ${SRCDIR}/include/dns/byaddr.h \ @@ -56,6 +58,7 @@ DNSINCS= ${SRCDIR}/include/dns/acl.h \ ${SRCDIR}/include/dns/dbtable.h \ ${SRCDIR}/include/dns/diff.h \ ${SRCDIR}/include/dns/dispatch.h \ + ${SRCDIR}/include/dns/dlz.h \ ${SRCDIR}/include/dns/dnssec.h \ ${SRCDIR}/include/dns/ds.h \ ${SRCDIR}/include/dns/events.h \ @@ -92,6 +95,7 @@ DNSINCS= ${SRCDIR}/include/dns/acl.h \ ${SRCDIR}/include/dns/result.h \ ${SRCDIR}/include/dns/rootns.h \ ${SRCDIR}/include/dns/sdb.h \ + ${SRCDIR}/include/dns/sdlz.h \ ${SRCDIR}/include/dns/secalg.h \ ${SRCDIR}/include/dns/secproto.h \ ${SRCDIR}/include/dns/soa.h \ diff --git a/lib/bind/isc/Makefile b/lib/bind/isc/Makefile index 0fd8342..22bcaa9 100644 --- a/lib/bind/isc/Makefile +++ b/lib/bind/isc/Makefile @@ -21,7 +21,7 @@ SRCS+= app.c dir.c entropy.c \ .PATH: ${SRCDIR}/nls SRCS+= msgcat.c \ -.PATH: ${SRCDIR}/nothreads +.PATH: ${SRCDIR}/pthreads SRCS+= condition.c mutex.c \ thread.c @@ -29,16 +29,20 @@ SRCS+= condition.c mutex.c \ SRCS+= inet_pton.c \ assertions.c base64.c bitstring.c buffer.c \ bufferlist.c commandline.c error.c event.c \ - hash.c heap.c hex.c hmacmd5.c \ + hash.c heap.c hex.c hmacmd5.c hmacsha.c \ lex.c lfsr.c lib.c log.c md5.c \ mem.c mutexblock.c netaddr.c netscope.c ondestroy.c \ parseint.c print.c quota.c random.c \ - ratelimiter.c region.c result.c rwlock.c \ - serial.c sha1.c sockaddr.c string.c strtoul.c \ + ratelimiter.c refcount.c region.c result.c rwlock.c \ + serial.c sha1.c sha2.c sockaddr.c string.c strtoul.c \ symtab.c task.c taskpool.c timer.c version.c -CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/nothreads/include +CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/pthreads/include CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} +CFLAGS+= -I${SRCDIR}/${ISC_ATOMIC_ARCH}/include + +DPADD= ${PTHREAD_DPADD} +LDADD= ${PTHREAD_LDADD} .if ${MK_BIND_LIBS} != "no" INCS= ${SRCDIR}/include/isc/app.h \ @@ -60,6 +64,7 @@ INCS= ${SRCDIR}/include/isc/app.h \ ${SRCDIR}/include/isc/heap.h \ ${SRCDIR}/include/isc/hex.h \ ${SRCDIR}/include/isc/hmacmd5.h \ + ${SRCDIR}/include/isc/hmacsha.h \ ${SRCDIR}/include/isc/interfaceiter.h \ ${SRCDIR}/include/isc/ipv6.h \ ${SRCDIR}/include/isc/lang.h \ @@ -91,6 +96,7 @@ INCS= ${SRCDIR}/include/isc/app.h \ ${SRCDIR}/include/isc/rwlock.h \ ${SRCDIR}/include/isc/serial.h \ ${SRCDIR}/include/isc/sha1.h \ + ${SRCDIR}/include/isc/sha2.h \ ${SRCDIR}/include/isc/sockaddr.h \ ${SRCDIR}/include/isc/socket.h \ ${SRCDIR}/include/isc/stdio.h \ @@ -103,10 +109,10 @@ INCS= ${SRCDIR}/include/isc/app.h \ ${SRCDIR}/include/isc/types.h \ ${SRCDIR}/include/isc/util.h \ ${SRCDIR}/include/isc/version.h \ - ${SRCDIR}/nothreads/include/isc/condition.h \ - ${SRCDIR}/nothreads/include/isc/mutex.h \ - ${SRCDIR}/nothreads/include/isc/once.h \ - ${SRCDIR}/nothreads/include/isc/thread.h \ + ${SRCDIR}/pthreads/include/isc/condition.h \ + ${SRCDIR}/pthreads/include/isc/mutex.h \ + ${SRCDIR}/pthreads/include/isc/once.h \ + ${SRCDIR}/pthreads/include/isc/thread.h \ ${SRCDIR}/unix/include/isc/dir.h \ ${SRCDIR}/unix/include/isc/int.h \ ${SRCDIR}/unix/include/isc/keyboard.h \ @@ -118,6 +124,7 @@ INCS= ${SRCDIR}/include/isc/app.h \ ${SRCDIR}/unix/include/isc/strerror.h \ ${SRCDIR}/unix/include/isc/syslog.h \ ${SRCDIR}/unix/include/isc/time.h \ + ${SRCDIR}/${ISC_ATOMIC_ARCH}/include/isc/atomic.h \ isc/platform.h INCSDIR= ${INCLUDEDIR}/isc diff --git a/lib/bind/isccc/Makefile b/lib/bind/isccc/Makefile index 84e1ba8..19fc2bf 100644 --- a/lib/bind/isccc/Makefile +++ b/lib/bind/isccc/Makefile @@ -17,6 +17,10 @@ SRCS= alist.c base64.c cc.c ccmsg.c \ result.c sexpr.c symtab.c version.c CFLAGS+= -I${SRCDIR}/include +CFLAGS+= -I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include + +DPADD= ${PTHREAD_DPADD} +LDADD= ${PTHREAD_LDADD} .if ${MK_BIND_LIBS} != "no" INCS= ${SRCDIR}/include/isccc/alist.h \ diff --git a/lib/bind/isccfg/Makefile b/lib/bind/isccfg/Makefile index 6c2309c..a4f5785 100644 --- a/lib/bind/isccfg/Makefile +++ b/lib/bind/isccfg/Makefile @@ -12,12 +12,17 @@ SRCDIR= ${BIND_DIR}/lib/isccfg LIB= isccfg .PATH: ${SRCDIR} -SRCS= log.c namedconf.c parser.c version.c +SRCS= aclconf.c log.c namedconf.c parser.c version.c CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} +CFLAGS+= -I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include + +DPADD= ${PTHREAD_DPADD} +LDADD= ${PTHREAD_LDADD} .if ${MK_BIND_LIBS} != "no" -INCS= ${SRCDIR}/include/isccfg/cfg.h \ +INCS= ${SRCDIR}/include/isccfg/aclconf.h \ + ${SRCDIR}/include/isccfg/cfg.h \ ${SRCDIR}/include/isccfg/grammar.h \ ${SRCDIR}/include/isccfg/log.h \ ${SRCDIR}/include/isccfg/namedconf.h \ diff --git a/lib/bind/lwres/Makefile b/lib/bind/lwres/Makefile index eef4589..09b7991 100644 --- a/lib/bind/lwres/Makefile +++ b/lib/bind/lwres/Makefile @@ -25,6 +25,10 @@ SRCS+= context.c gai_strerror.c getaddrinfo.c gethost.c \ CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include CFLAGS+= -I${.CURDIR} +CFLAGS+= -I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include + +DPADD= ${PTHREAD_DPADD} +LDADD= ${PTHREAD_LDADD} .if ${MK_BIND_LIBS} != "no" MAN= lwres.3 lwres_buffer.3 lwres_config.3 lwres_context.3 \ |