Module Name: src
Committed By: nia
Date: Sun Nov 8 21:56:48 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/usr.sbin/makemandb: Makefile
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/kyua-cli/Makefile.inc
cvs rdiff -u -r1.24 -r1.25 src/external/ibm-public/postfix/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 src/external/public-domain/sqlite/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/external/public-domain/sqlite/bin/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/public-domain/sqlite/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/sqlite/lib/sqlite3.pc.in
cvs rdiff -u -r1.9 -r1.10 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.7 src/external/bsd/kyua-cli/Makefile.inc:1.8
--- src/external/bsd/kyua-cli/Makefile.inc:1.7 Fri Oct 30 08:41:58 2020
+++ src/external/bsd/kyua-cli/Makefile.inc Sun Nov 8 21:56:47 2020
@@ -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 @@ DPADD+= ${LIBOBJDIR_${lib}}/lib${lib}.
.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
Index: src/external/ibm-public/postfix/Makefile.inc
diff -u src/external/ibm-public/postfix/Makefile.inc:1.24 src/external/ibm-public/postfix/Makefile.inc:1.25
--- src/external/ibm-public/postfix/Makefile.inc:1.24 Fri Oct 30 08:41:58 2020
+++ src/external/ibm-public/postfix/Makefile.inc Sun Nov 8 21:56:47 2020
@@ -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 @@ CPPFLAGS+= -DNO_IPV6
# 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.
Index: src/external/public-domain/sqlite/Makefile.inc
diff -u src/external/public-domain/sqlite/Makefile.inc:1.8 src/external/public-domain/sqlite/Makefile.inc:1.9
--- src/external/public-domain/sqlite/Makefile.inc:1.8 Thu Oct 29 12:38:06 2020
+++ src/external/public-domain/sqlite/Makefile.inc Sun Nov 8 21:56:48 2020
@@ -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 @@ CPPFLAGS+= \
-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 @@ CPPFLAGS+= \
-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
Index: src/external/public-domain/sqlite/bin/Makefile
diff -u src/external/public-domain/sqlite/bin/Makefile:1.6 src/external/public-domain/sqlite/bin/Makefile:1.7
--- src/external/public-domain/sqlite/bin/Makefile:1.6 Fri Oct 30 08:41:58 2020
+++ src/external/public-domain/sqlite/bin/Makefile Sun Nov 8 21:56:48 2020
@@ -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
Index: src/external/public-domain/sqlite/lib/Makefile
diff -u src/external/public-domain/sqlite/lib/Makefile:1.11 src/external/public-domain/sqlite/lib/Makefile:1.12
--- src/external/public-domain/sqlite/lib/Makefile:1.11 Thu Oct 29 16:35:33 2020
+++ src/external/public-domain/sqlite/lib/Makefile Sun Nov 8 21:56:48 2020
@@ -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 @@ SRCS= sqlite3.c
CFLAGS+= -DNDEBUG
-LDADD+= -lm
-DPADD+= ${LIBM}
+LDADD+= -lm -lpthread
+DPADD+= ${LIBM} ${LIBPTHREAD}
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.2 src/external/public-domain/sqlite/lib/sqlite3.pc.in:1.3
--- src/external/public-domain/sqlite/lib/sqlite3.pc.in:1.2 Thu Oct 29 16:35:33 2020
+++ src/external/public-domain/sqlite/lib/sqlite3.pc.in Sun Nov 8 21:56:48 2020
@@ -2,4 +2,4 @@ Name: SQLite
Description: SQL database engine
Version: @VERSION@
Libs: -lsqlite3
-Libs.private: -lm
+Libs.private: -lm -lpthread
Index: src/usr.sbin/makemandb/Makefile
diff -u src/usr.sbin/makemandb/Makefile:1.9 src/usr.sbin/makemandb/Makefile:1.10
--- src/usr.sbin/makemandb/Makefile:1.9 Sun Jun 18 16:24:10 2017
+++ src/usr.sbin/makemandb/Makefile Sun Nov 8 21:56:48 2020
@@ -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+= -L${MDOCMLOBJDIR} -lm
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}; \
