[src/trunk]: src/external/bsd/libfido2 fix sun2 build

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/92c762eaf8eb
branches:  trunk
changeset: 984012:92c762eaf8eb
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jun 18 13:57:52 2021 +0000

description:
fix sun2 build

diffstat:

 external/bsd/libfido2/Makefile.inc     |  5 +----
 external/bsd/libfido2/bin/Makefile.inc |  6 +++---
 external/bsd/libfido2/lib/Makefile     |  6 +++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diffs (51 lines):

diff -r 9fda15ce0ca9 -r 92c762eaf8eb external/bsd/libfido2/Makefile.inc
--- a/external/bsd/libfido2/Makefile.inc        Fri Jun 18 13:13:44 2021 +0000
+++ b/external/bsd/libfido2/Makefile.inc        Fri Jun 18 13:57:52 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2021/06/17 01:15:44 christos Exp $
+# $NetBSD: Makefile.inc,v 1.4 2021/06/18 13:57:52 christos Exp $
 
 DIST:=${.PARSEDIR}/dist
 
@@ -13,6 +13,3 @@
 CPPFLAGS+=-D_FIDO_MAJOR=${FIDO_MAJOR} -D_FIDO_MINOR=${FIDO_MINOR}
 CPPFLAGS+=-D_FIDO_PATCH=${FIDO_PATCH}
 CPPFLAGS+=-DHAVE_UNISTD_H -DHAVE_ARC4RANDOM_BUF -DHAVE_TIMESPECSUB
-
-LDFLAGS+=-lz
-DPFLAGS+=${LIBZ}
diff -r 9fda15ce0ca9 -r 92c762eaf8eb external/bsd/libfido2/bin/Makefile.inc
--- a/external/bsd/libfido2/bin/Makefile.inc    Fri Jun 18 13:13:44 2021 +0000
+++ b/external/bsd/libfido2/bin/Makefile.inc    Fri Jun 18 13:57:52 2021 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile.inc,v 1.2 2020/03/04 17:31:08 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.3 2021/06/18 13:57:52 christos Exp $
 
 .include "${.PARSEDIR}/../Makefile.inc"
 
 .PATH: ${DIST}/tools ${DIST}/man ${DIST}/openbsd-compat
 
-LDADD+=-lfido2 -lcbor -lusbhid -lcrypto  -lm
-DPADD+=${LIBFIDO2} ${LIBCBOR} ${LIBUSBHID} ${LIBCRYPTO} ${LIBM}
+LDADD+=-lfido2 -lcbor -lusbhid -lcrypto -lz -lm 
+DPADD+=${LIBFIDO2} ${LIBCBOR} ${LIBUSBHID} ${LIBCRYPTO} ${LIBZ} ${LIBM}
diff -r 9fda15ce0ca9 -r 92c762eaf8eb external/bsd/libfido2/lib/Makefile
--- a/external/bsd/libfido2/lib/Makefile        Fri Jun 18 13:13:44 2021 +0000
+++ b/external/bsd/libfido2/lib/Makefile        Fri Jun 18 13:57:52 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/06/17 12:38:53 christos Exp $
+# $NetBSD: Makefile,v 1.7 2021/06/18 13:57:52 christos Exp $
 
 NOLINT=
 .include <bsd.own.mk>
@@ -8,8 +8,8 @@
 
 CPPFLAGS+= -D_FIDO_INTERNAL -I${DIST}/src
 
-LDADD+=-lusbhid -lcbor
-DPADD+=${LIBUSBHID} ${LIBCBOR}
+LDADD+=-lusbhid -lcbor -lz
+DPADD+=${LIBUSBHID} ${LIBCBOR} ${LIBZ}
 
 LDFLAGS+=-Wl,--version-script=${DIST}/src/export.gnu