Page MenuHomeFreeBSD
Files F144360840

D16230.id45184.diff
No OneTemporary
Actions

D16230.id45184.diff
View Options

Index: lib/ofed/libibverbs/Makefile
===================================================================
--- lib/ofed/libibverbs/Makefile
+++ lib/ofed/libibverbs/Makefile
@@ -5,7 +5,7 @@
LIB= ibverbs
SHLIB_MAJOR= 1
-SHLIBDIR?= /usr/lib
+SHLIBDIR?= /lib
MK_PROFILE= no
VERSION_MAP= ${_spath}/libibverbs.map
Index: lib/ofed/libmlx5/Makefile
===================================================================
--- lib/ofed/libmlx5/Makefile
+++ lib/ofed/libmlx5/Makefile
@@ -3,7 +3,7 @@
_spath= ${SRCTOP}/contrib/ofed/libmlx5
.PATH: ${_spath}
-SHLIBDIR?= /usr/lib
+SHLIBDIR?= /lib
LIB= mlx5
SHLIB_MAJOR= 1
MK_PROFILE= no
Index: share/mk/src.opts.mk
===================================================================
--- share/mk/src.opts.mk
+++ share/mk/src.opts.mk
@@ -146,6 +146,7 @@
NLS_CATALOGS \
NS_CACHING \
NTP \
+ OFED \
OPENSSL \
PAM \
PC_SYSINSTALL \
@@ -198,7 +199,7 @@
LOADER_FORCE_LE \
LOADER_LUA \
NAND \
- OFED \
+ OFED_EXTRA \
OPENLDAP \
REPRODUCIBLE_BUILD \
RPCBIND_WARMSTART_SUPPORT \
@@ -475,6 +476,10 @@
MK_AUTHPF:= no
.endif
+.if ${MK_OFED} == "no"
+MK_OFED_EXTRA:= no
+.endif
+
.if ${MK_PORTSNAP} == "no"
# freebsd-update depends on phttpget from portsnap
MK_FREEBSD_UPDATE:= no
Index: tools/build/options/WITH_OFED_EXTRA
===================================================================
--- /dev/null
+++ tools/build/options/WITH_OFED_EXTRA
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to build the non-essential components of the
+.Dq "OpenFabrics Enterprise Distribution"
+Infiniband software stack, mostly examples.
Index: usr.bin/ofed/Makefile
===================================================================
--- usr.bin/ofed/Makefile
+++ usr.bin/ofed/Makefile
@@ -1,11 +1,16 @@
# $FreeBSD$
+.include <src.opts.mk>
+
SUBDIR= \
libibverbs \
librdmacm \
- opensm \
infiniband-diags
+.if ${MK_OFED_EXTRA} != "no"
+SIBDIR+= opensm
+.endif
+
SUBDIR_PARALLEL=
.include <bsd.subdir.mk>
Index: usr.bin/ofed/infiniband-diags/Makefile
===================================================================
--- usr.bin/ofed/infiniband-diags/Makefile
+++ usr.bin/ofed/infiniband-diags/Makefile
@@ -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=

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 9, 1:19 AM (3 m, 39 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28520077
Default Alt Text
D16230.id45184.diff (2 KB)

Event Timeline