From owner-dev-commits-src-branches@freebsd.org  Thu Feb  4 14:03:25 2021
Return-Path: <owner-dev-commits-src-branches@freebsd.org>
Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7F2BF5440CF;
 Thu,  4 Feb 2021 14:03:25 +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 4DWgHx37vRz3tHr;
 Thu,  4 Feb 2021 14:03:25 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 5EAF55055;
 Thu,  4 Feb 2021 14:03:25 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
 by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 114E3P5C040110;
 Thu, 4 Feb 2021 14:03:25 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 114E3Plx040109;
 Thu, 4 Feb 2021 14:03:25 GMT (envelope-from git)
Date: Thu, 4 Feb 2021 14:03:25 GMT
Message-Id: <202102041403.114E3Plx040109@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
 dev-commits-src-branches@FreeBSD.org
From: Mitchell Horne <mhorne@FreeBSD.org>
Subject: git: 63a3f5906676 - stable/13 - src.opts.mk: set MK_ZFS conditional
 on MK_OPENSSL
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mhorne
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 63a3f59066765c251de8cb80bf841b916b4f4061
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-branches@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the stable branches of the FreeBSD src repository
 <dev-commits-src-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-branches>, 
 <mailto:dev-commits-src-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-branches/>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Help: <mailto:dev-commits-src-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches>, 
 <mailto:dev-commits-src-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2021 14:03:25 -0000

The branch stable/13 has been updated by mhorne:

URL: https://cgit.FreeBSD.org/src/commit/?id=63a3f59066765c251de8cb80bf841b916b4f4061

commit 63a3f59066765c251de8cb80bf841b916b4f4061
Author:     Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2021-01-30 19:04:08 +0000
Commit:     Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2021-02-04 13:57:31 +0000

    src.opts.mk: set MK_ZFS conditional on MK_OPENSSL
    
    PR:             252841
    Reviewed by:    kevans, freqlabs
    
    (cherry picked from commit e5cc1c47484160969e0a7c13cdbc71081d7dd60e)
---
 share/mk/src.opts.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index a7eddb12d2c8..6c8100bac548 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -432,6 +432,7 @@ MK_LDNS:=	no
 MK_PKGBOOTSTRAP:=	no
 MK_SVN:=		no
 MK_SVNLITE:=		no
+MK_ZFS:=	no
 .endif
 
 .if ${MK_LDNS} == "no"