aboutsummaryrefslogtreecommitdiff
path: root/lib/Makefile
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2021-10-07 00:42:40 +0000
committerEd Maste <emaste@FreeBSD.org>2021-10-15 19:10:24 +0000
commit2e85df652caef859c532b7e1e8a178c75f1a4a92 (patch)
tree0bc9ba211f0e6c91543b0035c00b6d8bff54d4cc /lib/Makefile
parent67829b6307b8c81397cedaaf7a0e6e281560be32 (diff)
downloadsrc-2e85df652caef859c532b7e1e8a178c75f1a4a92.tar.gz
src-2e85df652caef859c532b7e1e8a178c75f1a4a92.zip
Add libcbor to the build
From https://github.com/PJK/libcbor: libcbor is a C library for parsing and generating CBOR, the general- purpose schema-less binary data format. libcbor will be used by ssh to support FIDO/U2F keys. It is currently intended only for use by ssh, and so is installed as a PRIVATELIB and is placed in the ssh pkgbase package. cbor_export.h and configuration.h were generated by the upstream CMake build. We could create them with bmake rules instead (as NetBSD has done) but this is a fine start. This is currently disabled for the 32-bit library build as libfido2 is not compatible with the COMPAT_32BIT hack in usb_ioctl.h, and there is no need for libcbor without libfido2. Reviewed by: kevans MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32347
Diffstat (limited to 'lib/Makefile')
-rw-r--r--lib/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 038763bfcba8..d39bbd37c910 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -215,6 +215,9 @@ SUBDIR.${MK_BHYVE}+= libvmmapi
.if ${MACHINE_ARCH} != "powerpc"
SUBDIR.${MK_OPENMP}+= libomp
.endif
+.if !defined(COMPAT_32BIT)
+SUBDIR.${MK_OPENSSH}+= libcbor
+.endif
SUBDIR.${MK_OPENSSL}+= libmp
SUBDIR.${MK_PF}+= libpfctl
SUBDIR.${MK_PMC}+= libpmc libpmcstat