From: Evan Hunt <each@isc.org>
Date: Wed, 20 Feb 2019 22:02:19 +0000 (-0800)
Subject: enable threads by default on openbsd 6.2 and higher
X-Git-Tag: v9.12.4rc1~7^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95fff9538f66badf18f37176302b61de334a47da;p=thirdparty%2Fbind9.git

enable threads by default on openbsd 6.2 and higher
---

diff --git a/config.threads.in b/config.threads.in
index 30cf7cda523..3240303e20b 100644
--- a/config.threads.in
+++ b/config.threads.in
@@ -39,10 +39,12 @@ case $host in
 	use_threads=false ;;
 *-netbsd*)
 	use_threads=true ;;
-*-openbsd*)
-	# OpenBSD users have reported that named dumps core on
+[*-openbsd[12345].*]|[*-openbsd6.[01]])
+	# OpenBSD users reported that named dumps core on
 	# startup when built with threads.
 	use_threads=false ;;
+*-openbsd*)
+	use_threads=true ;;
 [*-freebsd[1234567].*])
 	# Threads are broken at least up to FreeBSD 4.11.
 	# FreeBSD 5, 6 and 7 we have never officially supported threads
diff --git a/configure b/configure
index 5bdcd3dcca2..10a774ae36a 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996-2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 1996-2019  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -947,6 +947,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1119,6 +1120,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1371,6 +1373,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1508,7 +1519,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1661,6 +1672,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -15436,10 +15448,12 @@ case $host in
 	use_threads=false ;;
 *-netbsd*)
 	use_threads=true ;;
-*-openbsd*)
-	# OpenBSD users have reported that named dumps core on
+*-openbsd[12345].*|*-openbsd6.[01])
+	# OpenBSD users reported that named dumps core on
 	# startup when built with threads.
 	use_threads=false ;;
+*-openbsd*)
+	use_threads=true ;;
 *-freebsd[1234567].*)
 	# Threads are broken at least up to FreeBSD 4.11.
 	# FreeBSD 5, 6 and 7 we have never officially supported threads