Fri Oct 30 08:41:58 2020 UTC ()
libsqlite3 now requires -lm


(martin)
diff -r1.6 -r1.7 src/external/bsd/kyua-cli/Makefile.inc
diff -r1.23 -r1.24 src/external/ibm-public/postfix/Makefile.inc
diff -r1.5 -r1.6 src/external/public-domain/sqlite/bin/Makefile
diff -r1.332 -r1.333 src/share/mk/bsd.prog.mk
cvs diff -r1.6 -r1.7 src/external/bsd/kyua-cli/Makefile.inc (expand / switch to unified diff)

--- src/external/bsd/kyua-cli/Makefile.inc 2020/07/02 14:04:00 1.6
+++ src/external/bsd/kyua-cli/Makefile.inc 2020/10/30 08:41:58 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.6 2020/07/02 14:04:00 lukem Exp $ 1# $NetBSD: Makefile.inc,v 1.7 2020/10/30 08:41:58 martin Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5TOPDIR= ${NETBSDSRCDIR}/external/bsd/kyua-cli 5TOPDIR= ${NETBSDSRCDIR}/external/bsd/kyua-cli
6SRCDIR= ${TOPDIR}/dist 6SRCDIR= ${TOPDIR}/dist
7 7
8# Name of the private libraries (without their lib prefix) to depend on. 8# Name of the private libraries (without their lib prefix) to depend on.
9KYUA_LIBS?= 9KYUA_LIBS?=
10 10
11# Layout of installed files. 11# Layout of installed files.
12KYUA_BINDIR= /usr/bin 12KYUA_BINDIR= /usr/bin
13KYUA_CONFDIR= /etc/kyua 13KYUA_CONFDIR= /etc/kyua
14KYUA_DOCDIR= /usr/share/doc/reference/ref1/kyua/kyua-cli 14KYUA_DOCDIR= /usr/share/doc/reference/ref1/kyua/kyua-cli
@@ -48,28 +48,28 @@ CPPFLAGS+= -DKYUA_TESTERSDIR=\"${KYUA_TE @@ -48,28 +48,28 @@ CPPFLAGS+= -DKYUA_TESTERSDIR=\"${KYUA_TE
48CPPFLAGS+= -DKYUA_TESTSDIR=\"${KYUA_TESTSDIR}\" 48CPPFLAGS+= -DKYUA_TESTSDIR=\"${KYUA_TESTSDIR}\"
49 49
50CPPFLAGS+= -I${TOPDIR} # For config.h. 50CPPFLAGS+= -I${TOPDIR} # For config.h.
51CPPFLAGS+= -I${TOPDIR}/lib # For utils/defs.hpp. 51CPPFLAGS+= -I${TOPDIR}/lib # For utils/defs.hpp.
52CPPFLAGS+= -I${SRCDIR} 52CPPFLAGS+= -I${SRCDIR}
53 53
54.for lib in ${KYUA_LIBS} 54.for lib in ${KYUA_LIBS}
55LIBOBJDIR_${lib}!= cd ${TOPDIR}/lib/${lib}; ${PRINTOBJDIR} 55LIBOBJDIR_${lib}!= cd ${TOPDIR}/lib/${lib}; ${PRINTOBJDIR}
56LDADD+= ${LIBOBJDIR_${lib}}/lib${lib}.a 56LDADD+= ${LIBOBJDIR_${lib}}/lib${lib}.a
57DPADD+= ${LIBOBJDIR_${lib}}/lib${lib}.a 57DPADD+= ${LIBOBJDIR_${lib}}/lib${lib}.a
58.endfor 58.endfor
59 59
60.if !empty(KYUA_LIBS:Mutils) 60.if !empty(KYUA_LIBS:Mutils)
61LDADD+= -llutok -lsqlite3 61LDADD+= -llutok -lsqlite3 -lm
62DPADD+= ${LIBLUTOK} ${LIBSQLITE} 62DPADD+= ${LIBLUTOK} ${LIBSQLITE} ${LIBM}
63.endif 63.endif
64 64
65MANPAGE_DEPS = cookie-tarname cookie-version 65MANPAGE_DEPS = cookie-tarname cookie-version
66BUILD_MANPAGE = \ 66BUILD_MANPAGE = \
67 sed -e 's,__CONFDIR__,${KYUA_CONFDIR},g' \ 67 sed -e 's,__CONFDIR__,${KYUA_CONFDIR},g' \
68 -e 's,__DOCDIR__,${KYUA_DOCDIR},g' \ 68 -e 's,__DOCDIR__,${KYUA_DOCDIR},g' \
69 -e 's,__EGDIR__,${KYUA_EXAMPLESDIR},g' \ 69 -e 's,__EGDIR__,${KYUA_EXAMPLESDIR},g' \
70 -e 's,__MISCDIR__,${KYUA_MISCDIR},g' \ 70 -e 's,__MISCDIR__,${KYUA_MISCDIR},g' \
71 -e 's,__PACKAGE__,${KYUA_TARNAME},g' \ 71 -e 's,__PACKAGE__,${KYUA_TARNAME},g' \
72 -e 's,__STOREDIR__,${KYUA_STOREDIR},g' \ 72 -e 's,__STOREDIR__,${KYUA_STOREDIR},g' \
73 -e 's,__TESTERSDIR__,${KYUA_TESTERSDIR},g' \ 73 -e 's,__TESTERSDIR__,${KYUA_TESTERSDIR},g' \
74 -e 's,__TESTSDIR__,${KYUA_TESTSDIR},g' \ 74 -e 's,__TESTSDIR__,${KYUA_TESTSDIR},g' \
75 -e 's,__VERSION__,${KYUA_VERSION},g' \ 75 -e 's,__VERSION__,${KYUA_VERSION},g' \
cvs diff -r1.23 -r1.24 src/external/ibm-public/postfix/Makefile.inc (expand / switch to unified diff)

--- src/external/ibm-public/postfix/Makefile.inc 2020/04/20 13:04:10 1.23
+++ src/external/ibm-public/postfix/Makefile.inc 2020/10/30 08:41:58 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.23 2020/04/20 13:04:10 joerg Exp $ 1# $NetBSD: Makefile.inc,v 1.24 2020/10/30 08:41:58 martin Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5USE_FORT?= yes # network client and server 5USE_FORT?= yes # network client and server
6CWARNFLAGS.clang+= -Wno-empty-body -Wno-format-extra-args \ 6CWARNFLAGS.clang+= -Wno-empty-body -Wno-format-extra-args \
7 -Wno-string-plus-int -Wno-string-compare 7 -Wno-string-plus-int -Wno-string-compare
8WARNS?= 0 8WARNS?= 0
9 9
10PFIX_DISTDIR= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist 10PFIX_DISTDIR= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist
11 11
12CPPFLAGS+= -DNETBSD7 -DUSE_SASL_AUTH -DNO_EAI \ 12CPPFLAGS+= -DNETBSD7 -DUSE_SASL_AUTH -DNO_EAI \
13 -I${DIST} \ 13 -I${DIST} \
14 -I${PFIX_DISTDIR}/src/dns -I${PFIX_DISTDIR}/src/global \ 14 -I${PFIX_DISTDIR}/src/dns -I${PFIX_DISTDIR}/src/global \
@@ -35,28 +35,28 @@ CPPFLAGS+= -DCANT_USE_SEND_RECV_MSG @@ -35,28 +35,28 @@ CPPFLAGS+= -DCANT_USE_SEND_RECV_MSG
35.endif 35.endif
36 36
37# TLS support. 37# TLS support.
38CPPFLAGS+= -DUSE_TLS 38CPPFLAGS+= -DUSE_TLS
39 39
40# IPv6 support. 40# IPv6 support.
41.if ${MKINET6} == "no" 41.if ${MKINET6} == "no"
42CPPFLAGS+= -DNO_IPV6 42CPPFLAGS+= -DNO_IPV6
43.endif 43.endif
44 44
45# SQLite support. 45# SQLite support.
46CPPFLAGS+= -DHAS_SQLITE 46CPPFLAGS+= -DHAS_SQLITE
47. if defined(PROG) 47. if defined(PROG)
48DPADD+= ${LIBSQLITE3} 48DPADD+= ${LIBSQLITE3} ${LIBM}
49LDADD+= -lsqlite3 49LDADD+= -lsqlite3 -lm
50.endif 50.endif
51 51
52# LDAP support. 52# LDAP support.
53.if ${USE_LDAP} != "no" 53.if ${USE_LDAP} != "no"
54CPPFLAGS+= -DHAS_LDAP 54CPPFLAGS+= -DHAS_LDAP
55 55
56# Automatically link in libldap for a program. 56# Automatically link in libldap for a program.
57. if defined(PROG) 57. if defined(PROG)
58LDADD+= -lldap -llber 58LDADD+= -lldap -llber
59DPADD+= ${LIBLDAP} ${LIBLBER} 59DPADD+= ${LIBLDAP} ${LIBLBER}
60. if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "")) 60. if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != ""))
61DPADD+= ${LIBSSL} ${LIBCRYPTO} 61DPADD+= ${LIBSSL} ${LIBCRYPTO}
62LDADD+= -lssl -lcrypto 62LDADD+= -lssl -lcrypto
cvs diff -r1.5 -r1.6 src/external/public-domain/sqlite/bin/Makefile (expand / switch to unified diff)

--- src/external/public-domain/sqlite/bin/Makefile 2013/02/14 21:07:25 1.5
+++ src/external/public-domain/sqlite/bin/Makefile 2020/10/30 08:41:58 1.6
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1# $NetBSD: Makefile,v 1.5 2013/02/14 21:07:25 martin Exp $ 1# $NetBSD: Makefile,v 1.6 2020/10/30 08:41:58 martin Exp $
2 2
3PROG= sqlite3 3PROG= sqlite3
4 4
5SRCS= shell.c 5SRCS= shell.c
6 6
7DPADD+= ${LIBSQLITE3} ${LIBEDIT} ${LIBTERIMINFO} 7DPADD+= ${LIBSQLITE3} ${LIBEDIT} ${LIBTERIMINFO} ${LIBM}
8LDADD+= -lsqlite3 -ledit -lterminfo 8LDADD+= -lsqlite3 -ledit -lterminfo -lm
9 9
10BINDIR= /usr/bin 10BINDIR= /usr/bin
11 11
12.include <bsd.prog.mk> 12.include <bsd.prog.mk>
cvs diff -r1.332 -r1.333 src/share/mk/bsd.prog.mk (expand / switch to unified diff)

--- src/share/mk/bsd.prog.mk 2020/10/16 06:55:36 1.332
+++ src/share/mk/bsd.prog.mk 2020/10/30 08:41:58 1.333
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.prog.mk,v 1.332 2020/10/16 06:55:36 nia Exp $ 1# $NetBSD: bsd.prog.mk,v 1.333 2020/10/30 08:41:58 martin Exp $
2# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 2# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
3 3
4.ifndef HOSTPROG 4.ifndef HOSTPROG
5 5
6.include <bsd.init.mk> 6.include <bsd.init.mk>
7.include <bsd.shlib.mk> 7.include <bsd.shlib.mk>
8.include <bsd.gcc.mk> 8.include <bsd.gcc.mk>
9.include <bsd.sanitizer.mk> 9.include <bsd.sanitizer.mk>
10 10
11##### Sanitizer specific flags. 11##### Sanitizer specific flags.
12 12
13CFLAGS+= ${SANITIZERFLAGS} ${LIBCSANITIZERFLAGS} 13CFLAGS+= ${SANITIZERFLAGS} ${LIBCSANITIZERFLAGS}
14CXXFLAGS+= ${SANITIZERFLAGS} ${LIBCSANITIZERFLAGS} 14CXXFLAGS+= ${SANITIZERFLAGS} ${LIBCSANITIZERFLAGS}
@@ -216,42 +216,43 @@ _LIBLIST=\ @@ -216,42 +216,43 @@ _LIBLIST=\
216 216
217.for _lib in ${_LIBLIST} 217.for _lib in ${_LIBLIST}
218.ifndef LIB${_lib:tu} 218.ifndef LIB${_lib:tu}
219LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_lib:S/xx/++/:S/atf_c/atf-c/}.a 219LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_lib:S/xx/++/:S/atf_c/atf-c/}.a
220.MADE: ${LIB${_lib:tu}} # Note: ${DESTDIR} will be expanded 220.MADE: ${LIB${_lib:tu}} # Note: ${DESTDIR} will be expanded
221.endif 221.endif
222.endfor 222.endfor
223 223
224.if (${MKKERBEROS} != "no") 224.if (${MKKERBEROS} != "no")
225# Kerberos5 applications 225# Kerberos5 applications
226LIBKRB5_LDADD+= -lkrb5 -lcom_err \ 226LIBKRB5_LDADD+= -lkrb5 -lcom_err \
227 -lhx509 -lcrypto -lasn1 \ 227 -lhx509 -lcrypto -lasn1 \
228 -lwind -lheimbase -lcom_err -lroken \ 228 -lwind -lheimbase -lcom_err -lroken \
229 -lsqlite3 -lcrypt -lutil 229 -lsqlite3 -lm -lcrypt -lutil
230LIBKRB5_DPADD+= ${LIBKRB5} ${LIBCOM_ERR} \ 230LIBKRB5_DPADD+= ${LIBKRB5} ${LIBCOM_ERR} \
231 ${LIBHX509} ${LIBCRYPTO} ${LIBASN1} \ 231 ${LIBHX509} ${LIBCRYPTO} ${LIBASN1} \
232 ${LIBWIND} ${LIBHEIMBASE} ${LIBCOM_ERR} ${LIBROKEN} \ 232 ${LIBWIND} ${LIBHEIMBASE} ${LIBCOM_ERR} ${LIBROKEN} \
233 ${LIBSQLITE3} ${LIBCRYPT} ${LIBUTIL} 233 ${LIBSQLITE3} ${LIBM} ${LIBCRYPT} ${LIBUTIL}
234.endif 234.endif
235 235
236# PAM applications, if linked statically, need more libraries 236# PAM applications, if linked statically, need more libraries
237.if (${MKPIC} == "no") 237.if (${MKPIC} == "no")
238PAM_STATIC_LDADD+= -lssh 238PAM_STATIC_LDADD+= -lssh
239PAM_STATIC_DPADD+= ${LIBSSH} 239PAM_STATIC_DPADD+= ${LIBSSH}
240.if (${MKKERBEROS} != "no") 240.if (${MKKERBEROS} != "no")
241PAM_STATIC_LDADD+= -lkafs -lkrb5 -lhx509 -lwind -lasn1 \ 241PAM_STATIC_LDADD+= -lkafs -lkrb5 -lhx509 -lwind -lasn1 \
242 -lroken -lcom_err -lheimbase -lcrypto -lsqlite3 242 -lroken -lcom_err -lheimbase -lcrypto -lsqlite3 -lm
243PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBWIND} ${LIBASN1} \ 243PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBWIND} ${LIBASN1} \
244 ${LIBROKEN} ${LIBCOM_ERR} ${LIBHEIMBASE} ${LIBCRYPTO} ${LIBSQLITE3} 244 ${LIBROKEN} ${LIBCOM_ERR} ${LIBHEIMBASE} ${LIBCRYPTO} ${LIBSQLITE3} \
 245 ${LIBM}
245.endif 246.endif
246.if (${MKSKEY} != "no") 247.if (${MKSKEY} != "no")
247PAM_STATIC_LDADD+= -lskey 248PAM_STATIC_LDADD+= -lskey
248PAM_STATIC_DPADD+= ${LIBSKEY} 249PAM_STATIC_DPADD+= ${LIBSKEY}
249.endif 250.endif
250PAM_STATIC_LDADD+= -lradius -lcrypt -lrpcsvc -lutil 251PAM_STATIC_LDADD+= -lradius -lcrypt -lrpcsvc -lutil
251PAM_STATIC_DPADD+= ${LIBRADIUS} ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL} 252PAM_STATIC_DPADD+= ${LIBRADIUS} ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL}
252.else 253.else
253PAM_STATIC_LDADD= 254PAM_STATIC_LDADD=
254PAM_STATIC_DPADD= 255PAM_STATIC_DPADD=
255.endif 256.endif
256 257
257# NB: If you are a library here, add it in bsd.README 258# NB: If you are a library here, add it in bsd.README