Date: Sun, 21 Oct 2018 06:52:10 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339525 - head/share/mk Message-ID: <201810210652.w9L6qAUb029242@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sun Oct 21 06:52:10 2018 New Revision: 339525 URL: https://svnweb.freebsd.org/changeset/base/339525 Log: Use BROKEN_OPTIONS for NVME, HYPERV, CXGBETOOL and MLX5TOOL instead of __DEFAULT_YES/NO. These options simply cannot work where we were using __DEFAULT_NO. The proper thing to do in that case is to use the BROKEN_OPTIONS knob instead. Modified: head/share/mk/src.opts.mk Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Sun Oct 21 06:33:35 2018 (r339524) +++ head/share/mk/src.opts.mk Sun Oct 21 06:52:10 2018 (r339525) @@ -85,6 +85,7 @@ __DEFAULT_YES_OPTIONS = \ CTM \ CUSE \ CXX \ + CXGBETOOL \ DIALOG \ DICT \ DMAGENT \ @@ -111,6 +112,7 @@ __DEFAULT_YES_OPTIONS = \ GPIO \ HAST \ HTML \ + HYPERV \ ICONV \ INET \ INET6 \ @@ -140,12 +142,14 @@ __DEFAULT_YES_OPTIONS = \ MAIL \ MAILWRAPPER \ MAKE \ + MLX5TOOL \ NDIS \ NETCAT \ NETGRAPH \ NLS_CATALOGS \ NS_CACHING \ NTP \ + NVME \ OFED \ OPENSSL \ PAM \ @@ -365,27 +369,20 @@ BROKEN_OPTIONS+=LOADER_GELI LOADER_LUA # profiling won't work on MIPS64 because there is only assembly for o32 BROKEN_OPTIONS+=PROFILE .endif -.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386" || \ - ${__T} == "powerpc64" || ${__T} == "sparc64" -__DEFAULT_YES_OPTIONS+=CXGBETOOL -__DEFAULT_YES_OPTIONS+=MLX5TOOL -.else -__DEFAULT_NO_OPTIONS+=CXGBETOOL -__DEFAULT_NO_OPTIONS+=MLX5TOOL +.if ${__T} != "aarch64" && ${__T} != "amd64" && ${__T} != "i386" && \ + ${__T} != "powerpc64" && ${__T} != "sparc64" +BROKEN_OPTIONS+=CXGBETOOL +BROKEN_OPTIONS+=MLX5TOOL .endif # HyperV is currently x86-only -.if ${__T} == "amd64" || ${__T} == "i386" -__DEFAULT_YES_OPTIONS+=HYPERV -.else -__DEFAULT_NO_OPTIONS+=HYPERV +.if ${__T} != "amd64" && ${__T} != "i386" +BROKEN_OPTIONS+=HYPERV .endif # NVME is only x86 and powerpc64 -.if ${__T} == "amd64" || ${__T} == "i386" || ${__T} == "powerpc64" -__DEFAULT_YES_OPTIONS+=NVME -.else -__DEFAULT_NO_OPTIONS+=NVME +.if ${__T} != "amd64" && ${__T} != "i386" && ${__T} != "powerpc64" +BROKEN_OPTIONS+=NVME .endif .include <bsd.mkopt.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810210652.w9L6qAUb029242>