From a5f87bbff8d18741f66e46959c4c81a57a9d93a2 Mon Sep 17 00:00:00 2001
From: kib <kib@FreeBSD.org>
Date: Sat, 18 Aug 2018 16:03:15 +0000
Subject: [PATCH] MFC r336570: Enable OFED build (without extras) by default.
 For stable/11, this is only done on amd64.

Relnotes:	yes
Sponsored by:	Mellanox Technologies
---
 UPDATING             | 6 ++++++
 share/mk/src.opts.mk | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/UPDATING b/UPDATING
index 272ed1226c2..00b1a1b1bc0 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,12 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to
 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
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 43269ae5593..69c2630fe5f 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -196,7 +196,6 @@ __DEFAULT_NO_OPTIONS = \
     LOADER_FIREWIRE \
     LOADER_FORCE_LE \
     NAND \
-    OFED \
     OFED_EXTRA \
     OPENLDAP \
     REPRODUCIBLE_BUILD \
@@ -316,6 +315,12 @@ __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>
 
 #
-- 
2.45.0