git: 6adfb8155e17 - main - lib: Enable libcbor and libfido2 for COMPAT_32BIT

From: Jessica Clarke <jrtc27_at_FreeBSD.org>
Date: Sun, 09 Jul 2023 17:51:57 UTC
The branch main has been updated by jrtc27:

URL: https://cgit.FreeBSD.org/src/commit/?id=6adfb8155e17d94de0aac39a5965c137bad10e93

commit 6adfb8155e17d94de0aac39a5965c137bad10e93
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2023-07-09 17:45:56 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2023-07-09 17:45:56 +0000

    lib: Enable libcbor and libfido2 for COMPAT_32BIT
    
    We no longer have COMPAT_32BIT hacks for libusb, instead supporting the
    normal 32-bit ioctls for freebsd32 processes, so we can enable these for
    the lib32 build.
    
    Reviewed by:    emaste, brooks, jhb
    Differential Revision:  https://reviews.freebsd.org/D40920
---
 lib/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Makefile b/lib/Makefile
index 982cff8a29f9..d82fca7c5c69 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -206,7 +206,7 @@ SUBDIR.${MK_BHYVE}+=	libvmmapi
 .if ${MACHINE_ARCH} != "powerpc"
 SUBDIR.${MK_OPENMP}+=	libomp
 .endif
-.if !defined(COMPAT_32BIT) && ${MK_USB} != "no"
+.if ${MK_USB} != "no"
 SUBDIR.${MK_OPENSSH}+=	libcbor libfido2
 .endif
 SUBDIR.${MK_OPENSSL}+=	libmp