From nobody Sun Jul 09 17:51:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QzZT95DCpz4mVrM; Sun, 9 Jul 2023 17:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZT94XWSz3t84; Sun, 9 Jul 2023 17:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NRwd3gjfWX5NKrkcJQlMbIRoe2/obw44BKOLgfraY0U=; b=CkhAQvtmCHWSM28P/MMmDk7cZnlIiUW+kSTRSJLrMJG4SQeJlL+DPGrF1BPpCN+gLR9kB9 yBvlL82ySIf9OZjqHnrByZhMo1Q/yx6LJpAQFhoM8qRheayZONGT/UdYVKHaCBmjBaNunO BJBAg619nMo5/BVirxgASiAbttQwdRyI1qGKdCeXOGy2rKnH+ylzzdTBdtvvXB9FwlQU9t XkM/5R6xZ5NdZcgvQQo9CZv3/0+336SK29XVQse5s3cMM0IdC26yRnIiufAZurW+I8A+Nn 00rqkZsp8ivlY7u+hd4lQ5gVn8NA6Lg2dU71EGxcluD3GthSgqysoDFLG5jiOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NRwd3gjfWX5NKrkcJQlMbIRoe2/obw44BKOLgfraY0U=; b=nUWm/VIkHPSQsmNKFUP5bRUklT+7zEEH+cAxFZZuJY1PN2bQ2YomO9CKiOessjvUFMz5lA 2LFOT/og2XargmTeYqg7KuH31JQYtk4wgnE60ZhpcCdU8c8dYd15MTaLPgzA0NMwt+C+Jr MQMDjOH/4oI0Ucn9Cmh7rhtWaL02MTiZjzRhV3J+kjIxJp6zg5ELr6EmdfkcRox/rkniTz xUplZux3x6PFEj6nAssoQihQCdUNoojZsLULEiYvSnp/VnIG2ZVfeZeGOlWhbGoAMUF86O Cpweak/GHHkrZUU9SirmP21k6e0hDgqo3Dyw8ONsBbJz6OEsIp5Oj80shHVvFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925117; a=rsa-sha256; cv=none; b=Gx1wxg2ixkSG7KibvWE/iZPJ9fGRWh9AFa9XZDzqrCknYk/ikpBTFkQvUoHz+/imvjSN2x yBoq7oz/n7SsukhZZyoTUmz8wfY6hsJ8K7a51bf3YMmAlnHnax5OuRwOOG9X9Y7zyUqH8Q R9xYMCywvLKBxHXylXtCJkvVTYARN5qzu/bgWEk37madVsX7cI3tRn90TluJMhXic7whnI I8ampAt0bTzbCZ2ExSQ+jrmYEnLLWeN1sxscYCLYtDp3RlEtBSql/ngR22tx//0N48mxsi a3plVlAW2Hi8wgG79dlSx/q8bkAePBpc+/4V8mUKOeoGEx/wzcww84etNKOoZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZT93cQ8z1Byv; Sun, 9 Jul 2023 17:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369Hpvfh096418; Sun, 9 Jul 2023 17:51:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hpv88096417; Sun, 9 Jul 2023 17:51:57 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:51:57 GMT Message-Id: <202307091751.369Hpv88096417@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 6adfb8155e17 - main - lib: Enable libcbor and libfido2 for COMPAT_32BIT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6adfb8155e17d94de0aac39a5965c137bad10e93 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=6adfb8155e17d94de0aac39a5965c137bad10e93 commit 6adfb8155e17d94de0aac39a5965c137bad10e93 Author: Jessica Clarke AuthorDate: 2023-07-09 17:45:56 +0000 Commit: Jessica Clarke 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