Author: kib
Date: Fri Jul 20 23:52:11 2018
New Revision: 336569
URL: https://svnweb.freebsd.org/changeset/base/336569

Log:
  Move mostly useless examples binaries from OFED, as well as the Subnet
  Manager, under the new option WITH_OFED_EXTRA, disabled by default.
  
  Reviewed by:  bdrewery, hselasky (previous version)
  Sponsored by: Mellanox Technologies
  MFC after:    2 weeks
  Differential revision:        https://reviews.freebsd.org/D16230

Added:
  head/tools/build/options/WITH_OFED_EXTRA   (contents, props changed)
Modified:
  head/share/mk/src.opts.mk
  head/usr.bin/ofed/Makefile
  head/usr.bin/ofed/infiniband-diags/Makefile

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk   Fri Jul 20 23:49:57 2018        (r336568)
+++ head/share/mk/src.opts.mk   Fri Jul 20 23:52:11 2018        (r336569)
@@ -199,6 +199,7 @@ __DEFAULT_NO_OPTIONS = \
     LOADER_LUA \
     NAND \
     OFED \
+    OFED_EXTRA \
     OPENLDAP \
     REPRODUCIBLE_BUILD \
     RPCBIND_WARMSTART_SUPPORT \
@@ -464,6 +465,10 @@ MK_KERBEROS:=      no
 
 .if ${MK_PF} == "no"
 MK_AUTHPF:=    no
+.endif
+
+.if ${MK_OFED} == "no"
+MK_OFED_EXTRA:=        no
 .endif
 
 .if ${MK_PORTSNAP} == "no"

Added: head/tools/build/options/WITH_OFED_EXTRA
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/tools/build/options/WITH_OFED_EXTRA    Fri Jul 20 23:52:11 2018        
(r336569)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to build the non-essential components of the
+.Dq "OpenFabrics Enterprise Distribution"
+Infiniband software stack, mostly examples.

Modified: head/usr.bin/ofed/Makefile
==============================================================================
--- head/usr.bin/ofed/Makefile  Fri Jul 20 23:49:57 2018        (r336568)
+++ head/usr.bin/ofed/Makefile  Fri Jul 20 23:52:11 2018        (r336569)
@@ -1,10 +1,13 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 SUBDIR= \
        libibverbs \
        librdmacm \
-       opensm \
        infiniband-diags
+
+SUBDIR.${MK_OFED_EXTRA}+= opensm
 
 SUBDIR_PARALLEL=
 

Modified: head/usr.bin/ofed/infiniband-diags/Makefile
==============================================================================
--- head/usr.bin/ofed/infiniband-diags/Makefile Fri Jul 20 23:49:57 2018        
(r336568)
+++ head/usr.bin/ofed/infiniband-diags/Makefile Fri Jul 20 23:52:11 2018        
(r336569)
@@ -1,27 +1,33 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 SUBDIR= \
-dump_fts \
-ibaddr \
-ibcacheedit \
-ibccconfig \
-ibccquery \
-iblinkinfo \
-ibmirror \
-ibnetdiscover \
-ibping \
-ibportstate \
-ibqueryerrors \
-ibroute \
-ibstat \
-ibsysstat \
-ibtracert \
-perfquery \
-saquery \
-sminfo \
-smpdump \
-smpquery \
-vendstat
+       ibstat
+
+.if ${MK_OFED_EXTRA} != "no"
+SUBDIR+= \
+       dump_fts \
+       ibaddr \
+       ibcacheedit \
+       ibccconfig \
+       ibccquery \
+       iblinkinfo \
+       ibmirror \
+       ibnetdiscover \
+       ibping \
+       ibportstate \
+       ibqueryerrors \
+       ibroute \
+       ibsysstat \
+       ibtracert \
+       perfquery \
+       saquery \
+       sminfo \
+       smpdump \
+       smpquery \
+       vendstat
+.endif
 
 SUBDIR_PARALLEL=
 
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to