svn commit: r325763 - in projects/bsd_rdma_4_9: contrib/ofed contrib/ofed/libibcm contrib/ofed/libmlx4 contrib/ofed/libmlx5 contrib/ofed/librdmacm contrib/ofed/opensm/complib contrib/ofed/opensm/op...
Hans Petter Selasky
hselasky at FreeBSD.org
Mon Nov 13 12:36:38 UTC 2017
Author: hselasky
Date: Mon Nov 13 12:36:36 2017
New Revision: 325763
URL: https://svnweb.freebsd.org/changeset/base/325763
Log:
Fix OFED library dependencies.
Sponsored by: Mellanox Technologies
Modified:
projects/bsd_rdma_4_9/contrib/ofed/Makefile
projects/bsd_rdma_4_9/contrib/ofed/libibcm/Makefile
projects/bsd_rdma_4_9/contrib/ofed/libmlx4/Makefile
projects/bsd_rdma_4_9/contrib/ofed/libmlx5/Makefile
projects/bsd_rdma_4_9/contrib/ofed/librdmacm/Makefile
projects/bsd_rdma_4_9/contrib/ofed/opensm/complib/Makefile
projects/bsd_rdma_4_9/contrib/ofed/opensm/opensm/Makefile
projects/bsd_rdma_4_9/share/mk/bsd.libnames.mk
projects/bsd_rdma_4_9/share/mk/src.libnames.mk
Modified: projects/bsd_rdma_4_9/contrib/ofed/Makefile
==============================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/Makefile Mon Nov 13 11:36:22 2017 (r325762)
+++ projects/bsd_rdma_4_9/contrib/ofed/Makefile Mon Nov 13 12:36:36 2017 (r325763)
@@ -1,6 +1,6 @@
# $FreeBSD$
-SUBDIR_A_DEPEND=
+SUBDIR_A_DEPEND= ${_libthr}
SUBDIR_A= \
include
Modified: projects/bsd_rdma_4_9/contrib/ofed/libibcm/Makefile
==============================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/libibcm/Makefile Mon Nov 13 11:36:22 2017 (r325762)
+++ projects/bsd_rdma_4_9/contrib/ofed/libibcm/Makefile Mon Nov 13 12:36:36 2017 (r325763)
@@ -7,7 +7,7 @@ LIB= ibcm
SHLIB_MAJOR= 1
MK_PROFILE= no
SRCS= cm.c
-LDADD= ibverbs
+LIBADD= ibverbs
CFLAGS+= -I${.CURDIR}
MAN=
VERSION_MAP= ${.CURDIR}/libibcm.map
Modified: projects/bsd_rdma_4_9/contrib/ofed/libmlx4/Makefile
==============================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/libmlx4/Makefile Mon Nov 13 11:36:22 2017 (r325762)
+++ projects/bsd_rdma_4_9/contrib/ofed/libmlx4/Makefile Mon Nov 13 12:36:36 2017 (r325763)
@@ -16,7 +16,7 @@ qp.c \
srq.c \
verbs.c
-LDADD= ibverbs pthread
+LIBADD= ibverbs pthread
CFLAGS+= -I${.CURDIR}
.include <bsd.lib.mk>
Modified: projects/bsd_rdma_4_9/contrib/ofed/libmlx5/Makefile
==============================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/libmlx5/Makefile Mon Nov 13 11:36:22 2017 (r325762)
+++ projects/bsd_rdma_4_9/contrib/ofed/libmlx5/Makefile Mon Nov 13 12:36:36 2017 (r325763)
@@ -16,7 +16,7 @@ qp.c \
srq.c \
verbs.c
-LDADD= ibverbs pthread
+LIBADD= ibverbs pthread
CFLAGS+= -I${.CURDIR}
VERSION_MAP= ${.CURDIR}/libmlx5.map
Modified: projects/bsd_rdma_4_9/contrib/ofed/librdmacm/Makefile
==============================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/librdmacm/Makefile Mon Nov 13 11:36:22 2017 (r325762)
+++ projects/bsd_rdma_4_9/contrib/ofed/librdmacm/Makefile Mon Nov 13 12:36:36 2017 (r325763)
@@ -65,7 +65,7 @@ rdma_resolve_addr.3 \
rdma_resolve_route.3 \
rdma_set_option.3
-LDADD= ibverbs
+LIBADD= ibverbs
VERSION_MAP= ${.CURDIR}/librdmacm.map
.include <bsd.lib.mk>
Modified: projects/bsd_rdma_4_9/contrib/ofed/opensm/complib/Makefile
==============================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/opensm/complib/Makefile Mon Nov 13 11:36:22 2017 (r325762)
+++ projects/bsd_rdma_4_9/contrib/ofed/opensm/complib/Makefile Mon Nov 13 12:36:36 2017 (r325763)
@@ -28,7 +28,7 @@ ib_statustext.c
CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1
CFLAGS+= -I${INCLUDEDIR}/infiniband
-LDADD= pthread
+LIBADD= pthread
VERSION_MAP= ${.CURDIR}/libosmcomp.map
.include <bsd.lib.mk>
Modified: projects/bsd_rdma_4_9/contrib/ofed/opensm/opensm/Makefile
==============================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/opensm/opensm/Makefile Mon Nov 13 11:36:22 2017 (r325762)
+++ projects/bsd_rdma_4_9/contrib/ofed/opensm/opensm/Makefile Mon Nov 13 12:36:36 2017 (r325763)
@@ -96,6 +96,6 @@ st.c
MAN= opensm.8
CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1
CFLAGS+= -I${INCLUDEDIR}/infiniband
-LDADD= opensm osmvendor osmcomp wrap pthread
+LIBADD= opensm osmvendor osmcomp wrap pthread
.include <bsd.prog.mk>
Modified: projects/bsd_rdma_4_9/share/mk/bsd.libnames.mk
==============================================================================
--- projects/bsd_rdma_4_9/share/mk/bsd.libnames.mk Mon Nov 13 11:36:22 2017 (r325762)
+++ projects/bsd_rdma_4_9/share/mk/bsd.libnames.mk Mon Nov 13 12:36:36 2017 (r325763)
@@ -81,9 +81,8 @@ LIBHEIMNTLM?= ${LIBDESTDIR}${LIBDIR_BASE}/libheimntlm.
LIBHEIMSQLITE?= ${LIBDESTDIR}${LIBDIR_BASE}/libheimsqlite.a
LIBHX509?= ${LIBDESTDIR}${LIBDIR_BASE}/libhx509.a
LIBIBCM?= ${LIBDESTDIR}${LIBDIR_BASE}/libibcm.a
-LIBIBCOMMON?= ${LIBDESTDIR}${LIBDIR_BASE}/libibcommon.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
LIBIBVERBS?= ${LIBDESTDIR}${LIBDIR_BASE}/libibverbs.a
LIBIFCONFIG?= ${LIBDESTDIR}${LIBDIR_BASE}/libifconfig.a
@@ -107,6 +106,7 @@ LIBMEMSTAT?= ${LIBDESTDIR}${LIBDIR_BASE}/libmemstat.a
LIBMENU?= ${LIBDESTDIR}${LIBDIR_BASE}/libmenu.a
LIBMILTER?= ${LIBDESTDIR}${LIBDIR_BASE}/libmilter.a
LIBMLX4?= ${LIBDESTDIR}${LIBDIR_BASE}/libmlx4.a
+LIBMLX5?= ${LIBDESTDIR}${LIBDIR_BASE}/libmlx5.a
LIBMP?= ${LIBDESTDIR}${LIBDIR_BASE}/libmp.a
LIBMT?= ${LIBDESTDIR}${LIBDIR_BASE}/libmt.a
LIBNANDFS?= ${LIBDESTDIR}${LIBDIR_BASE}/libnandfs.a
Modified: projects/bsd_rdma_4_9/share/mk/src.libnames.mk
==============================================================================
--- projects/bsd_rdma_4_9/share/mk/src.libnames.mk Mon Nov 13 11:36:22 2017 (r325762)
+++ projects/bsd_rdma_4_9/share/mk/src.libnames.mk Mon Nov 13 12:36:36 2017 (r325763)
@@ -193,17 +193,16 @@ _LIBRARIES+= \
_LIBRARIES+= \
cxgb4 \
ibcm \
- ibcommon \
ibmad \
- ibsdp \
+ ibnetdisc \
ibumad \
ibverbs \
mlx4 \
- opensm \
- osmcomp \
- osmvendor \
+ mlx5 \
rdmacm \
-
+ osmcomp \
+ opensm \
+ osmvendor
.endif
# 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 bsdxm
zfs_core
_DP_zfs_core= nvpair
_DP_zpool= md pthread z nvpair avl umem
+
+# OFED support
.if ${MK_OFED} != "no"
_DP_cxgb4= ibverbs pthread
_DP_ibcm= ibverbs
-_DP_ibmad= ibcommon ibumad
-_DP_ibumad= ibcommon
+_DP_ibmad= ibumad
+_DP_ibnetdisc= osmcomp ibmad ibumad
+_DP_ibumad=
+_DP_ibverbs=
_DP_mlx4= ibverbs pthread
-_DP_opensm= pthread
-_DP_osmcomp= pthread
-_DP_osmvendor= ibumad opensm osmcomp pthread
+_DP_mlx5= ibverbs pthread
_DP_rdmacm= ibverbs
+_DP_osmcomp= pthread
+_DP_opensm= pthread
+_DP_osmvendor= ibumad pthread
.endif
# Define special cases
@@ -479,18 +483,21 @@ LIBUUTILDIR= ${OBJTOP}/cddl/lib/libuutil
LIBZFSDIR= ${OBJTOP}/cddl/lib/libzfs
LIBZFS_COREDIR= ${OBJTOP}/cddl/lib/libzfs_core
LIBZPOOLDIR= ${OBJTOP}/cddl/lib/libzpool
-LIBCXGB4DIR= ${OBJTOP}/contrib/ofed/usr.lib/libcxgb4
-LIBIBCMDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibcm
-LIBIBCOMMONDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibcommon
-LIBIBMADDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibmad
-LIBIBUMADDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibumad
-LIBIBVERBSDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibverbs
-LIBMLX4DIR= ${OBJTOP}/contrib/ofed/usr.lib/libmlx4
-LIBOPENSMDIR= ${OBJTOP}/contrib/ofed/usr.lib/libopensm
-LIBOSMCOMPDIR= ${OBJTOP}/contrib/ofed/usr.lib/libosmcomp
-LIBOSMVENDORDIR= ${OBJTOP}/contrib/ofed/usr.lib/libosmvendor
-LIBRDMACMDIR= ${OBJTOP}/contrib/ofed/usr.lib/librdmacm
-LIBIBSDPDIR= ${OBJTOP}/contrib/ofed/usr.lib/libsdp
+
+# OFED support
+LIBCXGB4DIR= ${OBJTOP}/contrib/ofed/libcxgb4
+LIBIBCMDIR= ${OBJTOP}/contrib/ofed/libibcm
+LIBIBMADDIR= ${OBJTOP}/contrib/ofed/libibmad
+LIBIBNETDISCDIR=${OBJTOP}/contrib/ofed/libibnetdisc
+LIBIBUMADDIR= ${OBJTOP}/contrib/ofed/libibumad
+LIBIBVERBSDIR= ${OBJTOP}/contrib/ofed/libibverbs
+LIBMLX4DIR= ${OBJTOP}/contrib/ofed/libmlx4
+LIBMLX5DIR= ${OBJTOP}/contrib/ofed/libmlx5
+LIBRDMACMDIR= ${OBJTOP}/contrib/ofed/librdmacm
+LIBOSMCOMPDIR= ${OBJTOP}/contrib/ofed/opensm/complib
+LIBOPENSMDIR= ${OBJTOP}/contrib/ofed/opensm/libopensm
+LIBOSMVENDORDIR=${OBJTOP}/contrib/ofed/opensm/libvendor
+
LIBDIALOGDIR= ${OBJTOP}/gnu/lib/libdialog
LIBGCOVDIR= ${OBJTOP}/gnu/lib/libgcov
LIBGOMPDIR= ${OBJTOP}/gnu/lib/libgomp
More information about the svn-src-projects
mailing list