[src/trunk]: src/usr.sbin/makemandb sqlite: do not build without multithreadi...

[nia <nia%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dff84bf168b9
branches:  trunk
changeset: 956872:dff84bf168b9
user:      nia <nia%NetBSD.org@localhost>
date:      Sun Nov 08 21:56:47 2020 +0000

description:
sqlite: do not build without multithreading support

at least a few pkgsrc packages avoid base sqlite because it fails
this check, and it's probably a surprising performance penalty for
unsuspecting users

diffstat:

 external/bsd/kyua-cli/Makefile.inc              |  6 +++---
 external/ibm-public/postfix/Makefile.inc        |  6 +++---
 external/public-domain/sqlite/Makefile.inc      |  6 +++---
 external/public-domain/sqlite/bin/Makefile      |  6 +++---
 external/public-domain/sqlite/lib/Makefile      |  6 +++---
 external/public-domain/sqlite/lib/sqlite3.pc.in |  2 +-
 usr.sbin/makemandb/Makefile                     |  8 +++++---
 7 files changed, 21 insertions(+), 19 deletions(-)

diffs (135 lines):

diff -r 9e2189cbb8f5 -r dff84bf168b9 external/bsd/kyua-cli/Makefile.inc
--- a/external/bsd/kyua-cli/Makefile.inc        Sun Nov 08 21:47:59 2020 +0000
+++ b/external/bsd/kyua-cli/Makefile.inc        Sun Nov 08 21:56:47 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2020/10/30 08:41:58 martin Exp $
+# $NetBSD: Makefile.inc,v 1.8 2020/11/08 21:56:47 nia Exp $
 
 .include <bsd.own.mk>
 
@@ -58,8 +58,8 @@
 .endfor
 
 .if !empty(KYUA_LIBS:Mutils)
-LDADD+=                -llutok -lsqlite3 -lm
-DPADD+=                ${LIBLUTOK} ${LIBSQLITE} ${LIBM}
+LDADD+=                -llutok -lsqlite3 -lm -lpthread
+DPADD+=                ${LIBLUTOK} ${LIBSQLITE} ${LIBM} ${LIBPTHREAD}
 .endif
 
 MANPAGE_DEPS = cookie-tarname cookie-version
diff -r 9e2189cbb8f5 -r dff84bf168b9 external/ibm-public/postfix/Makefile.inc
--- a/external/ibm-public/postfix/Makefile.inc  Sun Nov 08 21:47:59 2020 +0000
+++ b/external/ibm-public/postfix/Makefile.inc  Sun Nov 08 21:56:47 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.24 2020/10/30 08:41:58 martin Exp $
+#      $NetBSD: Makefile.inc,v 1.25 2020/11/08 21:56:47 nia Exp $
 
 .include <bsd.own.mk>
 
@@ -45,8 +45,8 @@
 # SQLite support.
 CPPFLAGS+=     -DHAS_SQLITE
 . if defined(PROG)
-DPADD+=                ${LIBSQLITE3} ${LIBM}
-LDADD+=                -lsqlite3 -lm
+DPADD+=                ${LIBSQLITE3} ${LIBM} ${LIBPTHREAD}
+LDADD+=                -lsqlite3 -lm -lpthread
 .endif
 
 # LDAP support.
diff -r 9e2189cbb8f5 -r dff84bf168b9 external/public-domain/sqlite/Makefile.inc
--- a/external/public-domain/sqlite/Makefile.inc        Sun Nov 08 21:47:59 2020 +0000
+++ b/external/public-domain/sqlite/Makefile.inc        Sun Nov 08 21:56:47 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2020/10/29 12:38:06 nia Exp $
+# $NetBSD: Makefile.inc,v 1.9 2020/11/08 21:56:48 nia Exp $
 
 WARNS=         2
 
@@ -15,6 +15,7 @@
                -DHAVE_STRERROR_R=1 \
                -DHAVE_USLEEP=1 \
                -DHAVE_SYS_ENDIAN_H=1 \
+               -DSQLITE_THREADSAFE \
                -DSQLITE_ENABLE_COLUMN_METADATA \
                -DSQLITE_ENABLE_FTS3_PARENTHESIS \
                -DSQLITE_ENABLE_FTS4 \
@@ -24,7 +25,6 @@
                -DSQLITE_ENABLE_GEOPOLY \
                -DSQLITE_ENABLE_LOAD_EXTENSION \
                -DSQLITE_ENABLE_UNLOCK_NOTIFY \
-               -DSQLITE_HAVE_ISNAN \
-        -DSQLITE_MAX_WORKER_THREADS=0
+               -DSQLITE_HAVE_ISNAN
 
 CWARNFLAGS+=   -Wno-shadow -Wno-unused
diff -r 9e2189cbb8f5 -r dff84bf168b9 external/public-domain/sqlite/bin/Makefile
--- a/external/public-domain/sqlite/bin/Makefile        Sun Nov 08 21:47:59 2020 +0000
+++ b/external/public-domain/sqlite/bin/Makefile        Sun Nov 08 21:56:47 2020 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2020/10/30 08:41:58 martin Exp $
+# $NetBSD: Makefile,v 1.7 2020/11/08 21:56:48 nia Exp $
 
 PROG=          sqlite3
 
 SRCS=          shell.c
 
-DPADD+=                ${LIBSQLITE3} ${LIBEDIT} ${LIBTERIMINFO} ${LIBM}
-LDADD+=                -lsqlite3 -ledit -lterminfo -lm
+DPADD+=                ${LIBSQLITE3} ${LIBEDIT} ${LIBTERIMINFO} ${LIBM} ${LIBPTHREAD}
+LDADD+=                -lsqlite3 -ledit -lterminfo -lpthread -lm
 
 BINDIR=                /usr/bin
 
diff -r 9e2189cbb8f5 -r dff84bf168b9 external/public-domain/sqlite/lib/Makefile
--- a/external/public-domain/sqlite/lib/Makefile        Sun Nov 08 21:47:59 2020 +0000
+++ b/external/public-domain/sqlite/lib/Makefile        Sun Nov 08 21:56:47 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/10/29 16:35:33 nia Exp $
+# $NetBSD: Makefile,v 1.12 2020/11/08 21:56:48 nia Exp $
 
 LIB=           sqlite3
 INCS=          sqlite3.h sqlite3ext.h
@@ -8,8 +8,8 @@
 
 CFLAGS+=       -DNDEBUG
 
-LDADD+=                -lm
-DPADD+=                ${LIBM}
+LDADD+=                -lm -lpthread
+DPADD+=                ${LIBM} ${LIBPTHREAD}
 
 FILES+=                        sqlite3.pc
 FILESOWN_sqlite3.pc=   ${BINOWN}
diff -r 9e2189cbb8f5 -r dff84bf168b9 external/public-domain/sqlite/lib/sqlite3.pc.in
--- a/external/public-domain/sqlite/lib/sqlite3.pc.in   Sun Nov 08 21:47:59 2020 +0000
+++ b/external/public-domain/sqlite/lib/sqlite3.pc.in   Sun Nov 08 21:56:47 2020 +0000
@@ -2,4 +2,4 @@
 Description: SQL database engine
 Version: @VERSION@
 Libs: -lsqlite3
-Libs.private: -lm
+Libs.private: -lm -lpthread
diff -r 9e2189cbb8f5 -r dff84bf168b9 usr.sbin/makemandb/Makefile
--- a/usr.sbin/makemandb/Makefile       Sun Nov 08 21:47:59 2020 +0000
+++ b/usr.sbin/makemandb/Makefile       Sun Nov 08 21:56:47 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/06/18 16:24:10 abhinav Exp $
+# $NetBSD: Makefile,v 1.10 2020/11/08 21:56:48 nia Exp $
 
 .include <bsd.own.mk>
 
@@ -29,8 +29,10 @@
 LDADD.makemandb+=      -lcrypto
 DPADD.makemandb+=      ${LIBCRYPTO}
 
-DPADD+=                ${LIBSQLITE3} ${LIBM} ${LIBZ} ${LIBTERMLIB} ${LIBUTIL}
-LDADD+=                -lsqlite3 -lm -lz -ltermlib -lutil
+DPADD+=                ${LIBSQLITE3} ${LIBM} ${LIBZ} ${LIBPTHREAD}
+LDADD+=                -lsqlite3 -lm -lz -lpthread
+DPADD+=                ${LIBTERMLIB} ${LIBUTIL}
+DPADD+=                -ltermlib -lutil
 
 stopwords.c: stopwords.txt
        ( set -e; ${TOOL_NBPERF} -n stopwords_hash -s -p ${.ALLSRC};    \