svn commit: r338017 - in stable/11: . share/mk

[Konstantin Belousov]

Author: kib
Date: Sat Aug 18 16:03:15 2018
New Revision: 338017
URL: https://svnweb.freebsd.org/changeset/base/338017

Log:
  MFC r336570:
  Enable OFED build (without extras) by default.
  For stable/11, this is only done on amd64.
  
  Relnotes:	yes
  Sponsored by:	Mellanox Technologies

Modified:
  stable/11/UPDATING
  stable/11/share/mk/src.opts.mk
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/UPDATING
==============================================================================
--- stable/11/UPDATING	Sat Aug 18 12:17:05 2018	(r338016)
+++ stable/11/UPDATING	Sat Aug 18 16:03:15 2018	(r338017)
@@ -16,6 +16,12 @@ from older versions of FreeBSD, try WITHOUT_CLANG and 
 the tip of head, and then rebuild without this option. The bootstrap process
 from older version of current across the gcc/clang cutover is a bit fragile.
 
+20180818:
+	WITH_OFED option now only enables the build for the OFED libraries
+	and some fundamental client utilities.  OpenSM and rest of the
+	debugging tools are enabled by WITH_OFED_EXTRA build switch.
+	WITH_OFED is turned on by default on amd64.
+
 20180714:
 	Clang, llvm, lld, lldb, compiler-rt and libc++ have been upgraded to
 	6.0.1.  Please see the 20141231 entry below for information about

Modified: stable/11/share/mk/src.opts.mk
==============================================================================
--- stable/11/share/mk/src.opts.mk	Sat Aug 18 12:17:05 2018	(r338016)
+++ stable/11/share/mk/src.opts.mk	Sat Aug 18 16:03:15 2018	(r338017)
@@ -196,7 +196,6 @@ __DEFAULT_NO_OPTIONS = \
     LOADER_FIREWIRE \
     LOADER_FORCE_LE \
     NAND \
-    OFED \
     OFED_EXTRA \
     OPENLDAP \
     REPRODUCIBLE_BUILD \
@@ -314,6 +313,12 @@ __DEFAULT_YES_OPTIONS+=MLX5TOOL
 .else
 __DEFAULT_NO_OPTIONS+=CXGBETOOL
 __DEFAULT_NO_OPTIONS+=MLX5TOOL
+.endif
+
+.if ${__T} == "amd64"
+__DEFAULT_YES_OPTIONS+=OFED
+.else
+__DEFAULT_NO_OPTIONS+=OFED
 .endif
 
 .include <bsd.mkopt.mk>