Module Name: src
Committed By: nia
Date: Thu Nov 12 17:53:44 UTC 2020
Modified Files:
src/external/bsd/kyua-cli: Makefile.inc
src/external/ibm-public/postfix: Makefile.inc
src/external/public-domain/sqlite: Makefile.inc
src/external/public-domain/sqlite/bin: Makefile
src/external/public-domain/sqlite/lib: Makefile sqlite3.pc.in
src/share/mk: bsd.prog.mk
src/usr.sbin/makemandb: Makefile
Log Message:
Revert addition of pthread dependency on sqlite.
It is less trivial than expected and introduced some surprising breakage.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/kyua-cli/Makefile.inc
cvs rdiff -u -r1.25 -r1.26 src/external/ibm-public/postfix/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/external/public-domain/sqlite/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/external/public-domain/sqlite/bin/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/public-domain/sqlite/lib/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/public-domain/sqlite/lib/sqlite3.pc.in
cvs rdiff -u -r1.335 -r1.336 src/share/mk/bsd.prog.mk
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/makemandb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/kyua-cli/Makefile.inc
diff -u src/external/bsd/kyua-cli/Makefile.inc:1.8 src/external/bsd/kyua-cli/Makefile.inc:1.9
--- src/external/bsd/kyua-cli/Makefile.inc:1.8 Sun Nov 8 21:56:47 2020
+++ src/external/bsd/kyua-cli/Makefile.inc Thu Nov 12 17:53:43 2020
@@ -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 @@ DPADD+= ${LIBOBJDIR_${lib}}/lib${lib}.
.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
Index: src/external/ibm-public/postfix/Makefile.inc
diff -u src/external/ibm-public/postfix/Makefile.inc:1.25 src/external/ibm-public/postfix/Makefile.inc:1.26
--- src/external/ibm-public/postfix/Makefile.inc:1.25 Sun Nov 8 21:56:47 2020
+++ src/external/ibm-public/postfix/Makefile.inc Thu Nov 12 17:53:43 2020
@@ -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 @@ CPPFLAGS+= -DNO_IPV6
# 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.
Index: src/external/public-domain/sqlite/Makefile.inc
diff -u src/external/public-domain/sqlite/Makefile.inc:1.9 src/external/public-domain/sqlite/Makefile.inc:1.10
--- src/external/public-domain/sqlite/Makefile.inc:1.9 Sun Nov 8 21:56:48 2020
+++ src/external/public-domain/sqlite/Makefile.inc Thu Nov 12 17:53:43 2020
@@ -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 @@ CPPFLAGS+= \
-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 \
Index: src/external/public-domain/sqlite/bin/Makefile
diff -u src/external/public-domain/sqlite/bin/Makefile:1.7 src/external/public-domain/sqlite/bin/Makefile:1.8
--- src/external/public-domain/sqlite/bin/Makefile:1.7 Sun Nov 8 21:56:48 2020
+++ src/external/public-domain/sqlite/bin/Makefile Thu Nov 12 17:53:43 2020
@@ -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
Index: src/external/public-domain/sqlite/lib/Makefile
diff -u src/external/public-domain/sqlite/lib/Makefile:1.12 src/external/public-domain/sqlite/lib/Makefile:1.13
--- src/external/public-domain/sqlite/lib/Makefile:1.12 Sun Nov 8 21:56:48 2020
+++ src/external/public-domain/sqlite/lib/Makefile Thu Nov 12 17:53:43 2020
@@ -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 @@ SRCS= sqlite3.c
CFLAGS+= -DNDEBUG
-LDADD+= -lm -lpthread
-DPADD+= ${LIBM} ${LIBPTHREAD}
+LDADD+= -lm
+DPADD+= ${LIBM}
FILES+= sqlite3.pc
FILESOWN_sqlite3.pc= ${BINOWN}
Index: src/external/public-domain/sqlite/lib/sqlite3.pc.in
diff -u src/external/public-domain/sqlite/lib/sqlite3.pc.in:1.3 src/external/public-domain/sqlite/lib/sqlite3.pc.in:1.4
--- src/external/public-domain/sqlite/lib/sqlite3.pc.in:1.3 Sun Nov 8 21:56:48 2020
+++ src/external/public-domain/sqlite/lib/sqlite3.pc.in Thu Nov 12 17:53:43 2020
@@ -2,4 +2,4 @@ Name: SQLite
Description: SQL database engine
Version: @VERSION@
Libs: -lsqlite3
-Libs.private: -lm -lpthread
+Libs.private: -lm
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.335 src/share/mk/bsd.prog.mk:1.336
--- src/share/mk/bsd.prog.mk:1.335 Mon Nov 9 16:15:05 2020
+++ src/share/mk/bsd.prog.mk Thu Nov 12 17:53:43 2020
@@ -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 @@ LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_
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_LDADD+= -lssh
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
Index: src/usr.sbin/makemandb/Makefile
diff -u src/usr.sbin/makemandb/Makefile:1.11 src/usr.sbin/makemandb/Makefile:1.12
--- src/usr.sbin/makemandb/Makefile:1.11 Mon Nov 9 10:19:41 2020
+++ src/usr.sbin/makemandb/Makefile Thu Nov 12 17:53:43 2020
@@ -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+= -L${MDOCMLOBJDIR} -lm
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}; \
