diff options
| author | dougb <dougb@FreeBSD.org> | 2007-06-02 23:19:58 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2007-06-02 23:19:58 +0000 |
| commit | 6828e8e3e514fe430f1754fada15a756032399a9 (patch) | |
| tree | 1ad7fe01d625e91cc274254cd136ada12496158a /lib/bind/config.mk | |
| parent | adb4c6dae5410feb32b67abbcd13f4e4647c9f83 (diff) | |
| download | FreeBSD-src-6828e8e3e514fe430f1754fada15a756032399a9.zip FreeBSD-src-6828e8e3e514fe430f1754fada15a756032399a9.tar.gz | |
Update bmake glue for the BIND 9.4.1 import.
This includes a return to building with threads, since one of the
major focuses of the 9.4.x branch is to improve thread performance.
Diffstat (limited to 'lib/bind/config.mk')
| -rw-r--r-- | lib/bind/config.mk | 17 |
1 files changed, 16 insertions, 1 deletions
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 + |
