Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk libsqlite3 now requires -lm



details:   https://anonhg.NetBSD.org/src/rev/d9e694b8b5a5
branches:  trunk
changeset: 941762:d9e694b8b5a5
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Oct 30 08:41:58 2020 +0000

description:
libsqlite3 now requires -lm

diffstat:

 external/bsd/kyua-cli/Makefile.inc         |   6 +++---
 external/ibm-public/postfix/Makefile.inc   |   6 +++---
 external/public-domain/sqlite/bin/Makefile |   6 +++---
 share/mk/bsd.prog.mk                       |  11 ++++++-----
 4 files changed, 15 insertions(+), 14 deletions(-)

diffs (94 lines):

diff -r e2a804da04aa -r d9e694b8b5a5 external/bsd/kyua-cli/Makefile.inc
--- a/external/bsd/kyua-cli/Makefile.inc        Fri Oct 30 08:13:17 2020 +0000
+++ b/external/bsd/kyua-cli/Makefile.inc        Fri Oct 30 08:41:58 2020 +0000
@@ -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 @@
 .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
diff -r e2a804da04aa -r d9e694b8b5a5 external/ibm-public/postfix/Makefile.inc
--- a/external/ibm-public/postfix/Makefile.inc  Fri Oct 30 08:13:17 2020 +0000
+++ b/external/ibm-public/postfix/Makefile.inc  Fri Oct 30 08:41:58 2020 +0000
@@ -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 @@
 # SQLite support.
 CPPFLAGS+=     -DHAS_SQLITE
 . if defined(PROG)
-DPADD+=                ${LIBSQLITE3}
-LDADD+=                -lsqlite3
+DPADD+=                ${LIBSQLITE3} ${LIBM}
+LDADD+=                -lsqlite3 -lm
 .endif
 
 # LDAP support.
diff -r e2a804da04aa -r d9e694b8b5a5 external/public-domain/sqlite/bin/Makefile
--- a/external/public-domain/sqlite/bin/Makefile        Fri Oct 30 08:13:17 2020 +0000
+++ b/external/public-domain/sqlite/bin/Makefile        Fri Oct 30 08:41:58 2020 +0000
@@ -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
 
diff -r e2a804da04aa -r d9e694b8b5a5 share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Fri Oct 30 08:13:17 2020 +0000
+++ b/share/mk/bsd.prog.mk      Fri Oct 30 08:41:58 2020 +0000
@@ -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 @@
 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_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



Home | Main Index | Thread Index | Old Index