git: e5cc1c474841 - main - src.opts.mk: set MK_ZFS conditional on MK_OPENSSL

Mitchell Horne mhorne at FreeBSD.org
Mon Feb 1 14:40:48 UTC 2021


The branch main has been updated by mhorne:

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

commit e5cc1c47484160969e0a7c13cdbc71081d7dd60e
Author:     Mitchell Horne <mhorne at FreeBSD.org>
AuthorDate: 2021-01-30 19:04:08 +0000
Commit:     Mitchell Horne <mhorne at FreeBSD.org>
CommitDate: 2021-02-01 14:31:17 +0000

    src.opts.mk: set MK_ZFS conditional on MK_OPENSSL
    
    libzfs has a dependency on libcrypto. This causes a buildworld link
    failure when WITHOUT_OPENSSL/WITHOUT_CRYPT is set.
    
    This dependency was added implicitly by the switch to OpenZFS, and
    explicitly in 40d0fd287510 and cd568e2b1b67.
    
    PR:             252841
    Reviewed by:    kevans, freqlabs
    MFC after:      3 days
    Differential Revision:  https://reviews.freebsd.org/D28431
---
 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 d3f7e33f276c..6cfab4b50613 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -438,6 +438,7 @@ MK_LDNS:=	no
 MK_PKGBOOTSTRAP:=	no
 MK_SVN:=		no
 MK_SVNLITE:=		no
+MK_ZFS:=	no
 .endif
 
 .if ${MK_LDNS} == "no"


More information about the dev-commits-src-main mailing list