Module Name: src
Committed By: martin
Date: Fri Oct 30 08:41:58 UTC 2020
Modified Files:
src/external/bsd/kyua-cli: Makefile.inc
src/external/ibm-public/postfix: Makefile.inc
src/external/public-domain/sqlite/bin: Makefile
src/share/mk: bsd.prog.mk
Log Message:
libsqlite3 now requires -lm
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/kyua-cli/Makefile.inc
cvs rdiff -u -r1.23 -r1.24 src/external/ibm-public/postfix/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/public-domain/sqlite/bin/Makefile
cvs rdiff -u -r1.332 -r1.333 src/share/mk/bsd.prog.mk
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.6 src/external/bsd/kyua-cli/Makefile.inc:1.7
--- src/external/bsd/kyua-cli/Makefile.inc:1.6 Thu Jul 2 14:04:00 2020
+++ src/external/bsd/kyua-cli/Makefile.inc Fri Oct 30 08:41:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2020/07/02 14:04:00 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.7 2020/10/30 08:41:58 martin Exp $
.include <bsd.own.mk>
@@ -58,8 +58,8 @@ DPADD+= ${LIBOBJDIR_${lib}}/lib${lib}.
.endfor
.if !empty(KYUA_LIBS:Mutils)
-LDADD+= -llutok -lsqlite3
-DPADD+= ${LIBLUTOK} ${LIBSQLITE}
+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.23 src/external/ibm-public/postfix/Makefile.inc:1.24
--- src/external/ibm-public/postfix/Makefile.inc:1.23 Mon Apr 20 13:04:10 2020
+++ src/external/ibm-public/postfix/Makefile.inc Fri Oct 30 08:41:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.23 2020/04/20 13:04:10 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.24 2020/10/30 08:41:58 martin Exp $
.include <bsd.own.mk>
@@ -45,8 +45,8 @@ CPPFLAGS+= -DNO_IPV6
# SQLite support.
CPPFLAGS+= -DHAS_SQLITE
. if defined(PROG)
-DPADD+= ${LIBSQLITE3}
-LDADD+= -lsqlite3
+DPADD+= ${LIBSQLITE3} ${LIBM}
+LDADD+= -lsqlite3 -lm
.endif
# LDAP support.
Index: src/external/public-domain/sqlite/bin/Makefile
diff -u src/external/public-domain/sqlite/bin/Makefile:1.5 src/external/public-domain/sqlite/bin/Makefile:1.6
--- src/external/public-domain/sqlite/bin/Makefile:1.5 Thu Feb 14 21:07:25 2013
+++ src/external/public-domain/sqlite/bin/Makefile Fri Oct 30 08:41:58 2020
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2013/02/14 21:07:25 martin Exp $
+# $NetBSD: Makefile,v 1.6 2020/10/30 08:41:58 martin Exp $
PROG= sqlite3
SRCS= shell.c
-DPADD+= ${LIBSQLITE3} ${LIBEDIT} ${LIBTERIMINFO}
-LDADD+= -lsqlite3 -ledit -lterminfo
+DPADD+= ${LIBSQLITE3} ${LIBEDIT} ${LIBTERIMINFO} ${LIBM}
+LDADD+= -lsqlite3 -ledit -lterminfo -lm
BINDIR= /usr/bin
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.332 src/share/mk/bsd.prog.mk:1.333
--- src/share/mk/bsd.prog.mk:1.332 Fri Oct 16 06:55:36 2020
+++ src/share/mk/bsd.prog.mk Fri Oct 30 08:41:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.332 2020/10/16 06:55:36 nia Exp $
+# $NetBSD: bsd.prog.mk,v 1.333 2020/10/30 08:41:58 martin Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -226,11 +226,11 @@ LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_
LIBKRB5_LDADD+= -lkrb5 -lcom_err \
-lhx509 -lcrypto -lasn1 \
-lwind -lheimbase -lcom_err -lroken \
- -lsqlite3 -lcrypt -lutil
+ -lsqlite3 -lm -lcrypt -lutil
LIBKRB5_DPADD+= ${LIBKRB5} ${LIBCOM_ERR} \
${LIBHX509} ${LIBCRYPTO} ${LIBASN1} \
${LIBWIND} ${LIBHEIMBASE} ${LIBCOM_ERR} ${LIBROKEN} \
- ${LIBSQLITE3} ${LIBCRYPT} ${LIBUTIL}
+ ${LIBSQLITE3} ${LIBM} ${LIBCRYPT} ${LIBUTIL}
.endif
# PAM applications, if linked statically, need more libraries
@@ -239,9 +239,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
+ -lroken -lcom_err -lheimbase -lcrypto -lsqlite3 -lm
PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBWIND} ${LIBASN1} \
- ${LIBROKEN} ${LIBCOM_ERR} ${LIBHEIMBASE} ${LIBCRYPTO} ${LIBSQLITE3}
+ ${LIBROKEN} ${LIBCOM_ERR} ${LIBHEIMBASE} ${LIBCRYPTO} ${LIBSQLITE3} \
+ ${LIBM}
.endif
.if (${MKSKEY} != "no")
PAM_STATIC_LDADD+= -lskey
