Fix OFED library dependencies.
Sponsored by: Mellanox Technologies
This commit is contained in:
parent
d388615314
commit
e110d0774b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/projects/bsd_rdma_4_9/; revision=325763
@ -1,6 +1,6 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
SUBDIR_A_DEPEND=
|
SUBDIR_A_DEPEND= ${_libthr}
|
||||||
SUBDIR_A= \
|
SUBDIR_A= \
|
||||||
include
|
include
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@ LIB= ibcm
|
|||||||
SHLIB_MAJOR= 1
|
SHLIB_MAJOR= 1
|
||||||
MK_PROFILE= no
|
MK_PROFILE= no
|
||||||
SRCS= cm.c
|
SRCS= cm.c
|
||||||
LDADD= ibverbs
|
LIBADD= ibverbs
|
||||||
CFLAGS+= -I${.CURDIR}
|
CFLAGS+= -I${.CURDIR}
|
||||||
MAN=
|
MAN=
|
||||||
VERSION_MAP= ${.CURDIR}/libibcm.map
|
VERSION_MAP= ${.CURDIR}/libibcm.map
|
||||||
|
@ -16,7 +16,7 @@ qp.c \
|
|||||||
srq.c \
|
srq.c \
|
||||||
verbs.c
|
verbs.c
|
||||||
|
|
||||||
LDADD= ibverbs pthread
|
LIBADD= ibverbs pthread
|
||||||
CFLAGS+= -I${.CURDIR}
|
CFLAGS+= -I${.CURDIR}
|
||||||
|
|
||||||
.include <bsd.lib.mk>
|
.include <bsd.lib.mk>
|
||||||
|
@ -16,7 +16,7 @@ qp.c \
|
|||||||
srq.c \
|
srq.c \
|
||||||
verbs.c
|
verbs.c
|
||||||
|
|
||||||
LDADD= ibverbs pthread
|
LIBADD= ibverbs pthread
|
||||||
CFLAGS+= -I${.CURDIR}
|
CFLAGS+= -I${.CURDIR}
|
||||||
VERSION_MAP= ${.CURDIR}/libmlx5.map
|
VERSION_MAP= ${.CURDIR}/libmlx5.map
|
||||||
|
|
||||||
|
@ -65,7 +65,7 @@ rdma_resolve_addr.3 \
|
|||||||
rdma_resolve_route.3 \
|
rdma_resolve_route.3 \
|
||||||
rdma_set_option.3
|
rdma_set_option.3
|
||||||
|
|
||||||
LDADD= ibverbs
|
LIBADD= ibverbs
|
||||||
VERSION_MAP= ${.CURDIR}/librdmacm.map
|
VERSION_MAP= ${.CURDIR}/librdmacm.map
|
||||||
|
|
||||||
.include <bsd.lib.mk>
|
.include <bsd.lib.mk>
|
||||||
|
@ -28,7 +28,7 @@ ib_statustext.c
|
|||||||
|
|
||||||
CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1
|
CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1
|
||||||
CFLAGS+= -I${INCLUDEDIR}/infiniband
|
CFLAGS+= -I${INCLUDEDIR}/infiniband
|
||||||
LDADD= pthread
|
LIBADD= pthread
|
||||||
VERSION_MAP= ${.CURDIR}/libosmcomp.map
|
VERSION_MAP= ${.CURDIR}/libosmcomp.map
|
||||||
|
|
||||||
.include <bsd.lib.mk>
|
.include <bsd.lib.mk>
|
||||||
|
@ -96,6 +96,6 @@ st.c
|
|||||||
MAN= opensm.8
|
MAN= opensm.8
|
||||||
CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1
|
CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1
|
||||||
CFLAGS+= -I${INCLUDEDIR}/infiniband
|
CFLAGS+= -I${INCLUDEDIR}/infiniband
|
||||||
LDADD= opensm osmvendor osmcomp wrap pthread
|
LIBADD= opensm osmvendor osmcomp wrap pthread
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -81,9 +81,8 @@ LIBHEIMNTLM?= ${LIBDESTDIR}${LIBDIR_BASE}/libheimntlm.a
|
|||||||
LIBHEIMSQLITE?= ${LIBDESTDIR}${LIBDIR_BASE}/libheimsqlite.a
|
LIBHEIMSQLITE?= ${LIBDESTDIR}${LIBDIR_BASE}/libheimsqlite.a
|
||||||
LIBHX509?= ${LIBDESTDIR}${LIBDIR_BASE}/libhx509.a
|
LIBHX509?= ${LIBDESTDIR}${LIBDIR_BASE}/libhx509.a
|
||||||
LIBIBCM?= ${LIBDESTDIR}${LIBDIR_BASE}/libibcm.a
|
LIBIBCM?= ${LIBDESTDIR}${LIBDIR_BASE}/libibcm.a
|
||||||
LIBIBCOMMON?= ${LIBDESTDIR}${LIBDIR_BASE}/libibcommon.a
|
|
||||||
LIBIBMAD?= ${LIBDESTDIR}${LIBDIR_BASE}/libibmad.a
|
LIBIBMAD?= ${LIBDESTDIR}${LIBDIR_BASE}/libibmad.a
|
||||||
LIBIBSDP?= ${LIBDESTDIR}${LIBDIR_BASE}/libibsdp.a
|
LIBIBNETDISC?= ${LIBDESTDIR}${LIBDIR_BASE}/libibnetdisc.a
|
||||||
LIBIBUMAD?= ${LIBDESTDIR}${LIBDIR_BASE}/libibumad.a
|
LIBIBUMAD?= ${LIBDESTDIR}${LIBDIR_BASE}/libibumad.a
|
||||||
LIBIBVERBS?= ${LIBDESTDIR}${LIBDIR_BASE}/libibverbs.a
|
LIBIBVERBS?= ${LIBDESTDIR}${LIBDIR_BASE}/libibverbs.a
|
||||||
LIBIFCONFIG?= ${LIBDESTDIR}${LIBDIR_BASE}/libifconfig.a
|
LIBIFCONFIG?= ${LIBDESTDIR}${LIBDIR_BASE}/libifconfig.a
|
||||||
@ -107,6 +106,7 @@ LIBMEMSTAT?= ${LIBDESTDIR}${LIBDIR_BASE}/libmemstat.a
|
|||||||
LIBMENU?= ${LIBDESTDIR}${LIBDIR_BASE}/libmenu.a
|
LIBMENU?= ${LIBDESTDIR}${LIBDIR_BASE}/libmenu.a
|
||||||
LIBMILTER?= ${LIBDESTDIR}${LIBDIR_BASE}/libmilter.a
|
LIBMILTER?= ${LIBDESTDIR}${LIBDIR_BASE}/libmilter.a
|
||||||
LIBMLX4?= ${LIBDESTDIR}${LIBDIR_BASE}/libmlx4.a
|
LIBMLX4?= ${LIBDESTDIR}${LIBDIR_BASE}/libmlx4.a
|
||||||
|
LIBMLX5?= ${LIBDESTDIR}${LIBDIR_BASE}/libmlx5.a
|
||||||
LIBMP?= ${LIBDESTDIR}${LIBDIR_BASE}/libmp.a
|
LIBMP?= ${LIBDESTDIR}${LIBDIR_BASE}/libmp.a
|
||||||
LIBMT?= ${LIBDESTDIR}${LIBDIR_BASE}/libmt.a
|
LIBMT?= ${LIBDESTDIR}${LIBDIR_BASE}/libmt.a
|
||||||
LIBNANDFS?= ${LIBDESTDIR}${LIBDIR_BASE}/libnandfs.a
|
LIBNANDFS?= ${LIBDESTDIR}${LIBDIR_BASE}/libnandfs.a
|
||||||
|
@ -193,17 +193,16 @@ _LIBRARIES+= \
|
|||||||
_LIBRARIES+= \
|
_LIBRARIES+= \
|
||||||
cxgb4 \
|
cxgb4 \
|
||||||
ibcm \
|
ibcm \
|
||||||
ibcommon \
|
|
||||||
ibmad \
|
ibmad \
|
||||||
ibsdp \
|
ibnetdisc \
|
||||||
ibumad \
|
ibumad \
|
||||||
ibverbs \
|
ibverbs \
|
||||||
mlx4 \
|
mlx4 \
|
||||||
opensm \
|
mlx5 \
|
||||||
osmcomp \
|
|
||||||
osmvendor \
|
|
||||||
rdmacm \
|
rdmacm \
|
||||||
|
osmcomp \
|
||||||
|
opensm \
|
||||||
|
osmvendor
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
# Each library's LIBADD needs to be duplicated here for static linkage of
|
# Each library's LIBADD needs to be duplicated here for static linkage of
|
||||||
@ -329,16 +328,21 @@ _DP_zfs= md pthread umem util uutil m nvpair avl bsdxml geom nvpair z \
|
|||||||
zfs_core
|
zfs_core
|
||||||
_DP_zfs_core= nvpair
|
_DP_zfs_core= nvpair
|
||||||
_DP_zpool= md pthread z nvpair avl umem
|
_DP_zpool= md pthread z nvpair avl umem
|
||||||
|
|
||||||
|
# OFED support
|
||||||
.if ${MK_OFED} != "no"
|
.if ${MK_OFED} != "no"
|
||||||
_DP_cxgb4= ibverbs pthread
|
_DP_cxgb4= ibverbs pthread
|
||||||
_DP_ibcm= ibverbs
|
_DP_ibcm= ibverbs
|
||||||
_DP_ibmad= ibcommon ibumad
|
_DP_ibmad= ibumad
|
||||||
_DP_ibumad= ibcommon
|
_DP_ibnetdisc= osmcomp ibmad ibumad
|
||||||
|
_DP_ibumad=
|
||||||
|
_DP_ibverbs=
|
||||||
_DP_mlx4= ibverbs pthread
|
_DP_mlx4= ibverbs pthread
|
||||||
_DP_opensm= pthread
|
_DP_mlx5= ibverbs pthread
|
||||||
_DP_osmcomp= pthread
|
|
||||||
_DP_osmvendor= ibumad opensm osmcomp pthread
|
|
||||||
_DP_rdmacm= ibverbs
|
_DP_rdmacm= ibverbs
|
||||||
|
_DP_osmcomp= pthread
|
||||||
|
_DP_opensm= pthread
|
||||||
|
_DP_osmvendor= ibumad pthread
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
# Define special cases
|
# Define special cases
|
||||||
@ -479,18 +483,21 @@ LIBUUTILDIR= ${OBJTOP}/cddl/lib/libuutil
|
|||||||
LIBZFSDIR= ${OBJTOP}/cddl/lib/libzfs
|
LIBZFSDIR= ${OBJTOP}/cddl/lib/libzfs
|
||||||
LIBZFS_COREDIR= ${OBJTOP}/cddl/lib/libzfs_core
|
LIBZFS_COREDIR= ${OBJTOP}/cddl/lib/libzfs_core
|
||||||
LIBZPOOLDIR= ${OBJTOP}/cddl/lib/libzpool
|
LIBZPOOLDIR= ${OBJTOP}/cddl/lib/libzpool
|
||||||
LIBCXGB4DIR= ${OBJTOP}/contrib/ofed/usr.lib/libcxgb4
|
|
||||||
LIBIBCMDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibcm
|
# OFED support
|
||||||
LIBIBCOMMONDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibcommon
|
LIBCXGB4DIR= ${OBJTOP}/contrib/ofed/libcxgb4
|
||||||
LIBIBMADDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibmad
|
LIBIBCMDIR= ${OBJTOP}/contrib/ofed/libibcm
|
||||||
LIBIBUMADDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibumad
|
LIBIBMADDIR= ${OBJTOP}/contrib/ofed/libibmad
|
||||||
LIBIBVERBSDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibverbs
|
LIBIBNETDISCDIR=${OBJTOP}/contrib/ofed/libibnetdisc
|
||||||
LIBMLX4DIR= ${OBJTOP}/contrib/ofed/usr.lib/libmlx4
|
LIBIBUMADDIR= ${OBJTOP}/contrib/ofed/libibumad
|
||||||
LIBOPENSMDIR= ${OBJTOP}/contrib/ofed/usr.lib/libopensm
|
LIBIBVERBSDIR= ${OBJTOP}/contrib/ofed/libibverbs
|
||||||
LIBOSMCOMPDIR= ${OBJTOP}/contrib/ofed/usr.lib/libosmcomp
|
LIBMLX4DIR= ${OBJTOP}/contrib/ofed/libmlx4
|
||||||
LIBOSMVENDORDIR= ${OBJTOP}/contrib/ofed/usr.lib/libosmvendor
|
LIBMLX5DIR= ${OBJTOP}/contrib/ofed/libmlx5
|
||||||
LIBRDMACMDIR= ${OBJTOP}/contrib/ofed/usr.lib/librdmacm
|
LIBRDMACMDIR= ${OBJTOP}/contrib/ofed/librdmacm
|
||||||
LIBIBSDPDIR= ${OBJTOP}/contrib/ofed/usr.lib/libsdp
|
LIBOSMCOMPDIR= ${OBJTOP}/contrib/ofed/opensm/complib
|
||||||
|
LIBOPENSMDIR= ${OBJTOP}/contrib/ofed/opensm/libopensm
|
||||||
|
LIBOSMVENDORDIR=${OBJTOP}/contrib/ofed/opensm/libvendor
|
||||||
|
|
||||||
LIBDIALOGDIR= ${OBJTOP}/gnu/lib/libdialog
|
LIBDIALOGDIR= ${OBJTOP}/gnu/lib/libdialog
|
||||||
LIBGCOVDIR= ${OBJTOP}/gnu/lib/libgcov
|
LIBGCOVDIR= ${OBJTOP}/gnu/lib/libgcov
|
||||||
LIBGOMPDIR= ${OBJTOP}/gnu/lib/libgomp
|
LIBGOMPDIR= ${OBJTOP}/gnu/lib/libgomp
|
||||||
|
Loading…
Reference in New Issue
Block a user