Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/bind Handle NetBSD-5 and 4 lack of atomics by d...



details:   https://anonhg.NetBSD.org/src/rev/cebf7d8d734e
branches:  trunk
changeset: 759680:cebf7d8d734e
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Dec 14 23:17:20 2010 +0000

description:
Handle NetBSD-5 and 4 lack of atomics by disabling threads.

diffstat:

 external/bsd/bind/Makefile.inc |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 8d718b76548c -r cebf7d8d734e external/bsd/bind/Makefile.inc
--- a/external/bsd/bind/Makefile.inc    Tue Dec 14 23:16:39 2010 +0000
+++ b/external/bsd/bind/Makefile.inc    Tue Dec 14 23:17:20 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.6 2010/11/06 21:32:49 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.7 2010/12/14 23:17:20 christos Exp $
 
 .if !defined(BIND9_MAKEFILE_INC)
 BIND9_MAKEFILE_INC=yes
@@ -17,7 +17,11 @@
 NAMED_USE_OPENSSL?=yes
 .endif
 
+.if exists(/usr/include/sys/atomic.h)
 NAMED_USE_PTHREADS?=yes
+.else
+NAMED_USE_PTHREADS?=no
+.endif
 
 IDIST=         ${NETBSDSRCDIR}/external/bsd/bind/dist
 BIND_SRCDIR=   ${NETBSDSRCDIR}/external/bsd/bind
@@ -89,7 +93,11 @@
 LDADD+= -lcrypto
 DPADD+= ${LIBCRYPTO}
 .else
-LIBDPLIBS+=    crypto  ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
+.if exists(${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto)
+LIBDPLIBS+=    crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypt)
+.else
+LIBDPLIBS+=    crypto ${NETBSDSRCDIR}/lib/libcrypto
+.endif
 .endif
 .endif
 



Home | Main Index | Thread Index | Old Index