Fix over/under-linking in contrib/ofed.

Sponsored by:	EMC / Isilon Storage Division

23 files changed, 52 insertions, 12 deletions

diff --git a/Makefile.inc1 b/Makefile.inc1
index d4f1bfd..ffa3f00 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1913,7 +1913,16 @@ _lib_libradius=	lib/libradius
 .endif
 
 .if ${MK_OFED} != "no"
-_ofed_lib=	contrib/ofed/usr.lib/
+_ofed_lib=		contrib/ofed/usr.lib
+_prebuild_libs+=	contrib/ofed/usr.lib/libosmcomp
+_prebuild_libs+=	contrib/ofed/usr.lib/libopensm
+_prebuild_libs+=	contrib/ofed/usr.lib/libibcommon
+_prebuild_libs+=	contrib/ofed/usr.lib/libibverbs
+_prebuild_libs+=	contrib/ofed/usr.lib/libibumad
+
+contrib/ofed/usr.lib/libopensm__L: lib/libthr__L
+contrib/ofed/usr.lib/libosmcomp__L: lib/libthr__L
+contrib/ofed/usr.lib/libibumad__L: contrib/ofed/usr.lib/libibcommon__L
 .endif
 
 .if ${MK_CASPER} != "no"
diff --git a/contrib/ofed/usr.bin/ibaddr/Makefile b/contrib/ofed/usr.bin/ibaddr/Makefile
index 2270900..a50eefa 100644
--- a/contrib/ofed/usr.bin/ibaddr/Makefile
+++ b/contrib/ofed/usr.bin/ibaddr/Makefile
@@ -5,7 +5,7 @@
 
 PROG=   ibaddr
 SRCS=   ibaddr.c ibdiag_common.c
-LIBADD= ibumad ibcommon ibmad
+LIBADD= ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibaddr.8
 
diff --git a/contrib/ofed/usr.bin/ibnetdiscover/Makefile b/contrib/ofed/usr.bin/ibnetdiscover/Makefile
index f77c6ec..e724341 100644
--- a/contrib/ofed/usr.bin/ibnetdiscover/Makefile
+++ b/contrib/ofed/usr.bin/ibnetdiscover/Makefile
@@ -5,7 +5,7 @@
 
 PROG=   ibnetdiscover
 SRCS=   ibnetdiscover.c grouping.c ibdiag_common.c
-LIBADD= ibumad ibcommon ibmad osmcomp pthread
+LIBADD= ibumad ibcommon ibmad osmcomp
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibnetdiscover.8
 
diff --git a/contrib/ofed/usr.bin/ibroute/Makefile b/contrib/ofed/usr.bin/ibroute/Makefile
index ab73621..bac5194 100644
--- a/contrib/ofed/usr.bin/ibroute/Makefile
+++ b/contrib/ofed/usr.bin/ibroute/Makefile
@@ -5,7 +5,7 @@
 
 PROG=   ibroute
 SRCS=   ibroute.c ibdiag_common.c
-LIBADD= ibumad ibcommon ibmad osmcomp pthread
+LIBADD= ibcommon ibmad osmcomp
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibroute.8
 
diff --git a/contrib/ofed/usr.bin/ibsendtrap/Makefile b/contrib/ofed/usr.bin/ibsendtrap/Makefile
index 33ac49a..8f94722 100644
--- a/contrib/ofed/usr.bin/ibsendtrap/Makefile
+++ b/contrib/ofed/usr.bin/ibsendtrap/Makefile
@@ -5,7 +5,7 @@
 
 PROG=   ibsendtrap
 SRCS=   ibsendtrap.c ibdiag_common.c
-LIBADD= ibumad ibcommon ibmad
+LIBADD= ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=
 
diff --git a/contrib/ofed/usr.bin/ibtracert/Makefile b/contrib/ofed/usr.bin/ibtracert/Makefile
index 9c4a494..821966f 100644
--- a/contrib/ofed/usr.bin/ibtracert/Makefile
+++ b/contrib/ofed/usr.bin/ibtracert/Makefile
@@ -5,7 +5,7 @@
 
 PROG=   ibtracert
 SRCS=   ibtracert.c ibdiag_common.c
-LIBADD= ibumad ibcommon ibmad osmcomp pthread
+LIBADD= ibumad ibcommon ibmad osmcomp
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibtracert.8
 
diff --git a/contrib/ofed/usr.bin/opensm/Makefile b/contrib/ofed/usr.bin/opensm/Makefile
index 4dd1b06..5b0bcb0 100644
--- a/contrib/ofed/usr.bin/opensm/Makefile
+++ b/contrib/ofed/usr.bin/opensm/Makefile
@@ -29,7 +29,7 @@ SRCS+=	osm_vl_arb_rcv.c st.c osm_perfmgr.c osm_perfmgr_db.c osm_event_plugin.c
 SRCS+=	osm_dump.c osm_ucast_cache.c osm_qos_parser_y.y osm_qos_parser_l.l
 SRCS+=	osm_qos_policy.c
 
-LIBADD= opensm osmvendor osmcomp ibmad ibumad ibcommon pthread
+LIBADD= opensm osmvendor osmcomp pthread
 CFLAGS+= -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP
 
 MAN=	opensm.8
diff --git a/contrib/ofed/usr.bin/saquery/Makefile b/contrib/ofed/usr.bin/saquery/Makefile
index 210224a..2155748 100644
--- a/contrib/ofed/usr.bin/saquery/Makefile
+++ b/contrib/ofed/usr.bin/saquery/Makefile
@@ -5,7 +5,7 @@
 
 PROG=   saquery
 SRCS=   saquery.c ibdiag_common.c
-LIBADD= ibumad ibcommon ibmad osmcomp osmvendor opensm pthread
+LIBADD= ibmad osmcomp osmvendor opensm
 CFLAGS+= -I${DIAGPATH}/include
 CFLAGS+= -DOSM_VENDOR_INTF_OPENIB -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP
 MAN=	saquery.8
diff --git a/contrib/ofed/usr.bin/sminfo/Makefile b/contrib/ofed/usr.bin/sminfo/Makefile
index 0ec6656..72e930d 100644
--- a/contrib/ofed/usr.bin/sminfo/Makefile
+++ b/contrib/ofed/usr.bin/sminfo/Makefile
@@ -5,7 +5,7 @@
 
 PROG=   sminfo
 SRCS=   sminfo.c ibdiag_common.c
-LIBADD= ibumad ibcommon ibmad
+LIBADD= ibumad ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	sminfo.8
 
diff --git a/contrib/ofed/usr.bin/smpquery/Makefile b/contrib/ofed/usr.bin/smpquery/Makefile
index f08df7d..01acbe2 100644
--- a/contrib/ofed/usr.bin/smpquery/Makefile
+++ b/contrib/ofed/usr.bin/smpquery/Makefile
@@ -5,7 +5,7 @@
 
 PROG=   smpquery
 SRCS=   smpquery.c ibdiag_common.c
-LIBADD= ibumad ibcommon ibmad osmcomp pthread
+LIBADD= ibumad ibmad osmcomp
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	smpquery.8
 
diff --git a/contrib/ofed/usr.bin/vendstat/Makefile b/contrib/ofed/usr.bin/vendstat/Makefile
index df18313..48cda6b 100644
--- a/contrib/ofed/usr.bin/vendstat/Makefile
+++ b/contrib/ofed/usr.bin/vendstat/Makefile
@@ -5,7 +5,7 @@
 
 PROG=   vendstat
 SRCS=   vendstat.c ibdiag_common.c
-LIBADD= ibumad ibcommon ibmad
+LIBADD= ibumad ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	vendstat.8
 
diff --git a/contrib/ofed/usr.lib/Makefile b/contrib/ofed/usr.lib/Makefile
index b9c249e..47b9759 100644
--- a/contrib/ofed/usr.lib/Makefile
+++ b/contrib/ofed/usr.lib/Makefile
@@ -1,6 +1,14 @@
 SUBDIR=	libibcommon libibmad libibumad libibverbs libmlx4 libmthca \
 	libopensm libosmcomp libosmvendor libibcm librdmacm libsdp libcxgb4
 
+SUBDIR_DEPEND_libcxgb4=	libibverbs
+SUBDIR_DEPEND_libibcm=	libibverbs
+SUBDIR_DEPEND_libibmad= libibcommon libibumad
+SUBDIR_DEPEND_libibumad= libibcommon
+SUBDIR_DEPEND_libmlx4=	libibverbs
+SUBDIR_DEPEND_libmthca=	libibverbs
+SUBDIR_DEPEND_libosmvendor=	libibumad libopensm libosmcomp
+SUBDIR_DEPEND_librdmacm=	libibverbs
 SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>
diff --git a/contrib/ofed/usr.lib/libcxgb4/Makefile b/contrib/ofed/usr.lib/libcxgb4/Makefile
index d4619e7..3c75043 100644
--- a/contrib/ofed/usr.lib/libcxgb4/Makefile
+++ b/contrib/ofed/usr.lib/libcxgb4/Makefile
@@ -16,6 +16,7 @@ MK_PROFILE=	no
 
 SRCS=	dev.c cq.c qp.c verbs.c
 
+LIBADD=	ibverbs pthread
 CFLAGS+= -g -DHAVE_CONFIG_H -DDEBUG
 CFLAGS+= -I${.CURDIR} -I${CXGBSRCDIR} -I${IBVERBSDIR}/include 
 
diff --git a/contrib/ofed/usr.lib/libibcm/Makefile b/contrib/ofed/usr.lib/libibcm/Makefile
index c07fcf0..5f895d0 100644
--- a/contrib/ofed/usr.lib/libibcm/Makefile
+++ b/contrib/ofed/usr.lib/libibcm/Makefile
@@ -15,6 +15,7 @@ SHLIB_MAJOR=	1
 MK_PROFILE=	no
 
 SRCS= cm.c
+LIBADD=	ibverbs
 CFLAGS+=	-I${IBCMDIR}/include
 
 MAN=
diff --git a/contrib/ofed/usr.lib/libibmad/Makefile b/contrib/ofed/usr.lib/libibmad/Makefile
index 43c66c3..4ccdb4f 100644
--- a/contrib/ofed/usr.lib/libibmad/Makefile
+++ b/contrib/ofed/usr.lib/libibmad/Makefile
@@ -16,6 +16,7 @@ MK_PROFILE=	no
 SRCS=	dump.c fields.c gs.c mad.c portid.c register.c resolve.c rpc.c sa.c \
 	serv.c smp.c vendor.c
 
+LIBADD=	ibcommon ibumad
 CFLAGS+= -DHAVE_CONFIG_H
 
 VERSION_MAP= ${IBSRCDIR}/libibmad.map
diff --git a/contrib/ofed/usr.lib/libibumad/Makefile b/contrib/ofed/usr.lib/libibumad/Makefile
index b420b1c..daa12c0 100644
--- a/contrib/ofed/usr.lib/libibumad/Makefile
+++ b/contrib/ofed/usr.lib/libibumad/Makefile
@@ -15,6 +15,7 @@ MK_PROFILE=	no
 
 SRCS=	umad.c
 
+LIBADD=	ibcommon
 CFLAGS+= -DHAVE_CONFIG_H
 
 VERSION_MAP= ${IBSRCDIR}/libibumad.map
diff --git a/contrib/ofed/usr.lib/libmlx4/Makefile b/contrib/ofed/usr.lib/libmlx4/Makefile
index 9959ec9..b4adc4c 100644
--- a/contrib/ofed/usr.lib/libmlx4/Makefile
+++ b/contrib/ofed/usr.lib/libmlx4/Makefile
@@ -16,6 +16,7 @@ MK_PROFILE=	no
 
 SRCS=	buf.c cq.c dbrec.c mlx4.c qp.c srq.c verbs.c
 
+LIBADD=	ibverbs pthread
 CFLAGS+= -DHAVE_CONFIG_H 
 CFLAGS+= -I${.CURDIR} -I${MLXSRCDIR} -I${IBVERBSDIR}/include
 
diff --git a/contrib/ofed/usr.lib/libmthca/Makefile b/contrib/ofed/usr.lib/libmthca/Makefile
index 4d0c607..d81d7cd 100644
--- a/contrib/ofed/usr.lib/libmthca/Makefile
+++ b/contrib/ofed/usr.lib/libmthca/Makefile
@@ -16,7 +16,7 @@ MK_PROFILE=	no
 
 SRCS=	ah.c buf.c cq.c memfree.c mthca.c qp.c srq.c verbs.c
 
-
+LIBADD=	ibverbs pthread
 CFLAGS+= -DHAVE_CONFIG_H 
 CFLAGS+= -I${.CURDIR} -I${MTHCASRCDIR} -I${IBVERBSDIR}/include
 
diff --git a/contrib/ofed/usr.lib/libopensm/Makefile b/contrib/ofed/usr.lib/libopensm/Makefile
index 7d2a524..a1c6002 100644
--- a/contrib/ofed/usr.lib/libopensm/Makefile
+++ b/contrib/ofed/usr.lib/libopensm/Makefile
@@ -13,6 +13,8 @@ MK_PROFILE=	no
 
 SRCS=	osm_log.c osm_mad_pool.c osm_helper.c
 
+LIBADD= pthread
+
 VERSION_MAP= ${OPENSMDIR}/opensm/libopensm.map
 
 .include <bsd.lib.mk>
diff --git a/contrib/ofed/usr.lib/libosmcomp/Makefile b/contrib/ofed/usr.lib/libosmcomp/Makefile
index 373e9be..1d06830 100644
--- a/contrib/ofed/usr.lib/libosmcomp/Makefile
+++ b/contrib/ofed/usr.lib/libosmcomp/Makefile
@@ -16,6 +16,8 @@ SRCS+=	cl_log.c cl_map.c cl_pool.c cl_ptr_vector.c cl_spinlock.c
 SRCS+=	cl_statustext.c cl_thread.c cl_threadpool.c cl_timer.c cl_vector.c
 SRCS+=	ib_statustext.c cl_nodenamemap.c
 
+LIBADD=	pthread
+
 VERSION_MAP= ${COMPLIBDIR}/libosmcomp.map
 
 .include <bsd.lib.mk>
diff --git a/contrib/ofed/usr.lib/libosmvendor/Makefile b/contrib/ofed/usr.lib/libosmvendor/Makefile
index 62cd8da..e277def 100644
--- a/contrib/ofed/usr.lib/libosmvendor/Makefile
+++ b/contrib/ofed/usr.lib/libosmvendor/Makefile
@@ -13,6 +13,7 @@ MK_PROFILE=	no
 
 SRCS=	osm_vendor_ibumad.c osm_vendor_ibumad_sa.c
 
+LIBADD=	ibumad opensm osmcomp pthread
 CFLAGS+= -DOSM_VENDOR_INTF_OPENIB
 
 VERSION_MAP= ${VENDORLIBDIR}/libosmvendor.map
diff --git a/contrib/ofed/usr.lib/librdmacm/Makefile b/contrib/ofed/usr.lib/librdmacm/Makefile
index 560931f..3845622 100644
--- a/contrib/ofed/usr.lib/librdmacm/Makefile
+++ b/contrib/ofed/usr.lib/librdmacm/Makefile
@@ -27,6 +27,7 @@ MAN+=	rdma_resolve_route.3 rdma_disconnect.3 rdma_set_option.3
 MAN+=	rdma_event_str.3 rping.1 rdma_free_devices.3 ucmatose.1
 MAN+=	rdma_get_cm_event.3 udaddy.1
 
+LIBADD=	ibverbs
 
 VERSION_MAP= ${RDMASRCDIR}/librdmacm.map
 
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index fad58d1..ad61787 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -312,6 +312,18 @@ _DP_zfs=	md pthread umem util uutil m nvpair avl bsdxml geom nvpair z \
 		zfs_core
 _DP_zfs_core=	nvpair
 _DP_zpool=	md pthread z nvpair avl umem
+.if ${MK_OFED} != "no"
+_DP_cxgb4=	ibverbs pthread
+_DP_ibcm=	ibverbs
+_DP_ibmad=	ibcommon ibumad
+_DP_ibumad=	ibcommon
+_DP_mlx4=	ibverbs pthread
+_DP_mthca=	ibverbs pthread
+_DP_opensm=	pthread
+_DP_osmcomp=	pthread
+_DP_osmvendor=	ibumad opensm osmcomp pthread
+_DP_rdmacm=	ibverbs
+.endif
 
 # Define special cases
 LDADD_supcplusplus=	-lsupc++