[src/trunk]: src/usr.sbin/makemandb Revert addition of pthread dependency on ...

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

details:   https://anonhg.NetBSD.org/src/rev/af508b22604b
branches:  trunk
changeset: 945978:af508b22604b
user:      nia <nia%NetBSD.org@localhost>
date:      Thu Nov 12 17:53:43 2020 +0000

description:
Revert addition of pthread dependency on sqlite.

It is less trivial than expected and introduced some surprising breakage.

diffstat:

 external/bsd/kyua-cli/Makefile.inc              |   6 +++---
 external/ibm-public/postfix/Makefile.inc        |   6 +++---
 external/public-domain/sqlite/Makefile.inc      |   4 ++--
 external/public-domain/sqlite/bin/Makefile      |   6 +++---
 external/public-domain/sqlite/lib/Makefile      |   6 +++---
 external/public-domain/sqlite/lib/sqlite3.pc.in |   2 +-
 share/mk/bsd.prog.mk                            |  10 +++++-----
 usr.sbin/makemandb/Makefile                     |   6 +++---
 8 files changed, 23 insertions(+), 23 deletions(-)

diffs (161 lines):

diff -r 5861e24cb52c -r af508b22604b external/bsd/kyua-cli/Makefile.inc
--- a/external/bsd/kyua-cli/Makefile.inc        Thu Nov 12 13:13:45 2020 +0000
+++ b/external/bsd/kyua-cli/Makefile.inc        Thu Nov 12 17:53:43 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2020/11/08 21:56:47 nia Exp $
+# $NetBSD: Makefile.inc,v 1.9 2020/11/12 17:53:43 nia Exp $
 
 .include <bsd.own.mk>
 
@@ -58,8 +58,8 @@
 .endfor
 
 .if !empty(KYUA_LIBS:Mutils)
-LDADD+=                -llutok -lsqlite3 -lm -lpthread
-DPADD+=                ${LIBLUTOK} ${LIBSQLITE} ${LIBM} ${LIBPTHREAD}
+LDADD+=                -llutok -lsqlite3 -lm
+DPADD+=                ${LIBLUTOK} ${LIBSQLITE} ${LIBM}
 .endif
 
 MANPAGE_DEPS = cookie-tarname cookie-version
diff -r 5861e24cb52c -r af508b22604b external/ibm-public/postfix/Makefile.inc
--- a/external/ibm-public/postfix/Makefile.inc  Thu Nov 12 13:13:45 2020 +0000
+++ b/external/ibm-public/postfix/Makefile.inc  Thu Nov 12 17:53:43 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.25 2020/11/08 21:56:47 nia Exp $
+#      $NetBSD: Makefile.inc,v 1.26 2020/11/12 17:53:43 nia Exp $
 
 .include <bsd.own.mk>
 
@@ -45,8 +45,8 @@
 # SQLite support.
 CPPFLAGS+=     -DHAS_SQLITE
 . if defined(PROG)
-DPADD+=                ${LIBSQLITE3} ${LIBM} ${LIBPTHREAD}
-LDADD+=                -lsqlite3 -lm -lpthread
+DPADD+=                ${LIBSQLITE3} ${LIBM}
+LDADD+=                -lsqlite3 -lm
 .endif
 
 # LDAP support.
diff -r 5861e24cb52c -r af508b22604b external/public-domain/sqlite/Makefile.inc
--- a/external/public-domain/sqlite/Makefile.inc        Thu Nov 12 13:13:45 2020 +0000
+++ b/external/public-domain/sqlite/Makefile.inc        Thu Nov 12 17:53:43 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2020/11/08 21:56:48 nia Exp $
+# $NetBSD: Makefile.inc,v 1.10 2020/11/12 17:53:43 nia Exp $
 
 WARNS=         2
 
@@ -15,7 +15,7 @@
                -DHAVE_STRERROR_R=1 \
                -DHAVE_USLEEP=1 \
                -DHAVE_SYS_ENDIAN_H=1 \
-               -DSQLITE_THREADSAFE \
+               -DSQLITE_MAX_WORKER_THREADS=0 \
                -DSQLITE_ENABLE_COLUMN_METADATA \
                -DSQLITE_ENABLE_FTS3_PARENTHESIS \
                -DSQLITE_ENABLE_FTS4 \
diff -r 5861e24cb52c -r af508b22604b external/public-domain/sqlite/bin/Makefile
--- a/external/public-domain/sqlite/bin/Makefile        Thu Nov 12 13:13:45 2020 +0000
+++ b/external/public-domain/sqlite/bin/Makefile        Thu Nov 12 17:53:43 2020 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2020/11/08 21:56:48 nia Exp $
+# $NetBSD: Makefile,v 1.8 2020/11/12 17:53:43 nia Exp $
 
 PROG=          sqlite3
 
 SRCS=          shell.c
 
-DPADD+=                ${LIBSQLITE3} ${LIBEDIT} ${LIBTERIMINFO} ${LIBM} ${LIBPTHREAD}
-LDADD+=                -lsqlite3 -ledit -lterminfo -lpthread -lm
+DPADD+=                ${LIBSQLITE3} ${LIBEDIT} ${LIBTERIMINFO} ${LIBM}
+LDADD+=                -lsqlite3 -ledit -lterminfo -lm
 
 BINDIR=                /usr/bin
 
diff -r 5861e24cb52c -r af508b22604b external/public-domain/sqlite/lib/Makefile
--- a/external/public-domain/sqlite/lib/Makefile        Thu Nov 12 13:13:45 2020 +0000
+++ b/external/public-domain/sqlite/lib/Makefile        Thu Nov 12 17:53:43 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/11/08 21:56:48 nia Exp $
+# $NetBSD: Makefile,v 1.13 2020/11/12 17:53:43 nia Exp $
 
 LIB=           sqlite3
 INCS=          sqlite3.h sqlite3ext.h
@@ -8,8 +8,8 @@
 
 CFLAGS+=       -DNDEBUG
 
-LDADD+=                -lm -lpthread
-DPADD+=                ${LIBM} ${LIBPTHREAD}
+LDADD+=                -lm
+DPADD+=                ${LIBM}
 
 FILES+=                        sqlite3.pc
 FILESOWN_sqlite3.pc=   ${BINOWN}
diff -r 5861e24cb52c -r af508b22604b external/public-domain/sqlite/lib/sqlite3.pc.in
--- a/external/public-domain/sqlite/lib/sqlite3.pc.in   Thu Nov 12 13:13:45 2020 +0000
+++ b/external/public-domain/sqlite/lib/sqlite3.pc.in   Thu Nov 12 17:53:43 2020 +0000
@@ -2,4 +2,4 @@
 Description: SQL database engine
 Version: @VERSION@
 Libs: -lsqlite3
-Libs.private: -lm -lpthread
+Libs.private: -lm
diff -r 5861e24cb52c -r af508b22604b share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Thu Nov 12 13:13:45 2020 +0000
+++ b/share/mk/bsd.prog.mk      Thu Nov 12 17:53:43 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.prog.mk,v 1.335 2020/11/09 16:15:05 christos Exp $
+#      $NetBSD: bsd.prog.mk,v 1.336 2020/11/12 17:53:43 nia Exp $
 #      @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -222,11 +222,11 @@
 LIBKRB5_LDADD+= -lkrb5 -lcom_err \
        -lhx509 -lcrypto -lasn1 \
        -lwind -lheimbase -lcom_err -lroken \
-       -lsqlite3 -lpthread -lm -lcrypt -lutil
+       -lsqlite3 -lm -lcrypt -lutil
 LIBKRB5_DPADD+= ${LIBKRB5} ${LIBCOM_ERR} \
        ${LIBHX509} ${LIBCRYPTO} ${LIBASN1} \
        ${LIBWIND} ${LIBHEIMBASE} ${LIBCOM_ERR} ${LIBROKEN} \
-       ${LIBSQLITE3} ${LIBM} ${LIPPTHREAD} ${LIBCRYPT}  ${LIBUTIL}
+       ${LIBSQLITE3} ${LIBM} ${LIBCRYPT} ${LIBUTIL}
 .endif
 
 # PAM applications, if linked statically, need more libraries
@@ -235,10 +235,10 @@
 PAM_STATIC_DPADD+= ${LIBSSH}
 .if (${MKKERBEROS} != "no")
 PAM_STATIC_LDADD+= -lkafs -lkrb5 -lhx509 -lwind -lasn1 \
-       -lroken -lcom_err -lheimbase -lcrypto -lsqlite3 -lpthread -lm
+       -lroken -lcom_err -lheimbase -lcrypto -lsqlite3 -lm
 PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBWIND} ${LIBASN1} \
        ${LIBROKEN} ${LIBCOM_ERR} ${LIBHEIMBASE} ${LIBCRYPTO} ${LIBSQLITE3} \
-       ${LIBPTHREAD} ${LIBM}
+       ${LIBM}
 .endif
 .if (${MKSKEY} != "no")
 PAM_STATIC_LDADD+= -lskey
diff -r 5861e24cb52c -r af508b22604b usr.sbin/makemandb/Makefile
--- a/usr.sbin/makemandb/Makefile       Thu Nov 12 13:13:45 2020 +0000
+++ b/usr.sbin/makemandb/Makefile       Thu Nov 12 17:53:43 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/11/09 10:19:41 martin Exp $
+# $NetBSD: Makefile,v 1.12 2020/11/12 17:53:43 nia Exp $
 
 .include <bsd.own.mk>
 
@@ -29,8 +29,8 @@
 LDADD.makemandb+=      -lcrypto
 DPADD.makemandb+=      ${LIBCRYPTO}
 
-DPADD+=                ${LIBSQLITE3} ${LIBM} ${LIBPTHREAD} ${LIBZ} ${LIBTERMLIB} ${LIBUTIL}
-LDADD+=                -lsqlite3 -lm -lz -ltermlib -lutil -lpthread
+DPADD+=                ${LIBSQLITE3} ${LIBM} ${LIBZ} ${LIBTERMLIB} ${LIBUTIL}
+LDADD+=                -lsqlite3 -lm -lz -ltermlib -lutil
 
 stopwords.c: stopwords.txt
        ( set -e; ${TOOL_NBPERF} -n stopwords_hash -s -p ${.ALLSRC};    \