Module Name: src
Committed By: christos
Date: Fri Jun 18 13:57:52 UTC 2021
Modified Files:
src/external/bsd/libfido2: Makefile.inc
src/external/bsd/libfido2/bin: Makefile.inc
src/external/bsd/libfido2/lib: Makefile
Log Message:
fix sun2 build
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libfido2/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libfido2/bin/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/libfido2/lib/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/libfido2/Makefile.inc
diff -u src/external/bsd/libfido2/Makefile.inc:1.3 src/external/bsd/libfido2/Makefile.inc:1.4
--- src/external/bsd/libfido2/Makefile.inc:1.3 Wed Jun 16 21:15:44 2021
+++ src/external/bsd/libfido2/Makefile.inc Fri Jun 18 09:57:52 2021
@@ -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 @@ FIDO_VERSION=${FIDO_MAJOR}.${FIDO_MINOR}
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}
Index: src/external/bsd/libfido2/bin/Makefile.inc
diff -u src/external/bsd/libfido2/bin/Makefile.inc:1.2 src/external/bsd/libfido2/bin/Makefile.inc:1.3
--- src/external/bsd/libfido2/bin/Makefile.inc:1.2 Wed Mar 4 12:31:08 2020
+++ src/external/bsd/libfido2/bin/Makefile.inc Fri Jun 18 09:57:52 2021
@@ -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}
Index: src/external/bsd/libfido2/lib/Makefile
diff -u src/external/bsd/libfido2/lib/Makefile:1.6 src/external/bsd/libfido2/lib/Makefile:1.7
--- src/external/bsd/libfido2/lib/Makefile:1.6 Thu Jun 17 08:38:53 2021
+++ src/external/bsd/libfido2/lib/Makefile Fri Jun 18 09:57:52 2021
@@ -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 @@ NOLINT=
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
