Fix over/under-linking in contrib/ofed.
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery
parent
ee05c0f1b8
commit
400b94bbeb
@ -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"
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
PROG= ibsendtrap
|
||||
SRCS= ibsendtrap.c ibdiag_common.c
|
||||
LIBADD= ibumad ibcommon ibmad
|
||||
LIBADD= ibmad
|
||||
CFLAGS+= -I${DIAGPATH}/include
|
||||
MAN=
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -15,6 +15,7 @@ SHLIB_MAJOR= 1
|
||||
MK_PROFILE= no
|
||||
|
||||
SRCS= cm.c
|
||||
LIBADD= ibverbs
|
||||
CFLAGS+= -I${IBCMDIR}/include
|
||||
|
||||
MAN=
|
||||
|
||||
@ -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
|
||||
|
||||
@ -15,6 +15,7 @@ MK_PROFILE= no
|
||||
|
||||
SRCS= umad.c
|
||||
|
||||
LIBADD= ibcommon
|
||||
CFLAGS+= -DHAVE_CONFIG_H
|
||||
|
||||
VERSION_MAP= ${IBSRCDIR}/libibumad.map
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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++
|
||||
|
||||
Loading…
Reference in New Issue
Block a user