Date: Fri, 4 Mar 2016 22:37:10 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296398 - in head: . contrib/ofed/usr.bin/ibaddr contrib/ofed/usr.bin/ibnetdiscover contrib/ofed/usr.bin/ibroute contrib/ofed/usr.bin/ibsendtrap contrib/ofed/usr.bin/ibtracert contrib/o... Message-ID: <201603042237.u24MbA8S052813@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Mar 4 22:37:09 2016 New Revision: 296398 URL: https://svnweb.freebsd.org/changeset/base/296398 Log: Fix over/under-linking in contrib/ofed. Sponsored by: EMC / Isilon Storage Division Modified: head/Makefile.inc1 head/contrib/ofed/usr.bin/ibaddr/Makefile head/contrib/ofed/usr.bin/ibnetdiscover/Makefile head/contrib/ofed/usr.bin/ibroute/Makefile head/contrib/ofed/usr.bin/ibsendtrap/Makefile head/contrib/ofed/usr.bin/ibtracert/Makefile head/contrib/ofed/usr.bin/opensm/Makefile head/contrib/ofed/usr.bin/saquery/Makefile head/contrib/ofed/usr.bin/sminfo/Makefile head/contrib/ofed/usr.bin/smpquery/Makefile head/contrib/ofed/usr.bin/vendstat/Makefile head/contrib/ofed/usr.lib/Makefile head/contrib/ofed/usr.lib/libcxgb4/Makefile head/contrib/ofed/usr.lib/libibcm/Makefile head/contrib/ofed/usr.lib/libibmad/Makefile head/contrib/ofed/usr.lib/libibumad/Makefile head/contrib/ofed/usr.lib/libmlx4/Makefile head/contrib/ofed/usr.lib/libmthca/Makefile head/contrib/ofed/usr.lib/libopensm/Makefile head/contrib/ofed/usr.lib/libosmcomp/Makefile head/contrib/ofed/usr.lib/libosmvendor/Makefile head/contrib/ofed/usr.lib/librdmacm/Makefile head/share/mk/src.libnames.mk Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Fri Mar 4 22:37:00 2016 (r296397) +++ head/Makefile.inc1 Fri Mar 4 22:37:09 2016 (r296398) @@ -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" Modified: head/contrib/ofed/usr.bin/ibaddr/Makefile ============================================================================== --- head/contrib/ofed/usr.bin/ibaddr/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.bin/ibaddr/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -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 Modified: head/contrib/ofed/usr.bin/ibnetdiscover/Makefile ============================================================================== --- head/contrib/ofed/usr.bin/ibnetdiscover/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.bin/ibnetdiscover/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -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 Modified: head/contrib/ofed/usr.bin/ibroute/Makefile ============================================================================== --- head/contrib/ofed/usr.bin/ibroute/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.bin/ibroute/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -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 Modified: head/contrib/ofed/usr.bin/ibsendtrap/Makefile ============================================================================== --- head/contrib/ofed/usr.bin/ibsendtrap/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.bin/ibsendtrap/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -5,7 +5,7 @@ PROG= ibsendtrap SRCS= ibsendtrap.c ibdiag_common.c -LIBADD= ibumad ibcommon ibmad +LIBADD= ibmad CFLAGS+= -I${DIAGPATH}/include MAN= Modified: head/contrib/ofed/usr.bin/ibtracert/Makefile ============================================================================== --- head/contrib/ofed/usr.bin/ibtracert/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.bin/ibtracert/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -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 Modified: head/contrib/ofed/usr.bin/opensm/Makefile ============================================================================== --- head/contrib/ofed/usr.bin/opensm/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.bin/opensm/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -29,7 +29,7 @@ SRCS+= osm_vl_arb_rcv.c st.c osm_perfmgr 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 Modified: head/contrib/ofed/usr.bin/saquery/Makefile ============================================================================== --- head/contrib/ofed/usr.bin/saquery/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.bin/saquery/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -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 Modified: head/contrib/ofed/usr.bin/sminfo/Makefile ============================================================================== --- head/contrib/ofed/usr.bin/sminfo/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.bin/sminfo/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -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 Modified: head/contrib/ofed/usr.bin/smpquery/Makefile ============================================================================== --- head/contrib/ofed/usr.bin/smpquery/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.bin/smpquery/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -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 Modified: head/contrib/ofed/usr.bin/vendstat/Makefile ============================================================================== --- head/contrib/ofed/usr.bin/vendstat/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.bin/vendstat/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -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 Modified: head/contrib/ofed/usr.lib/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.lib/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -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> Modified: head/contrib/ofed/usr.lib/libcxgb4/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libcxgb4/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.lib/libcxgb4/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -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 Modified: head/contrib/ofed/usr.lib/libibcm/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libibcm/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.lib/libibcm/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -15,6 +15,7 @@ SHLIB_MAJOR= 1 MK_PROFILE= no SRCS= cm.c +LIBADD= ibverbs CFLAGS+= -I${IBCMDIR}/include MAN= Modified: head/contrib/ofed/usr.lib/libibmad/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libibmad/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.lib/libibmad/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -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 Modified: head/contrib/ofed/usr.lib/libibumad/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libibumad/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.lib/libibumad/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -15,6 +15,7 @@ MK_PROFILE= no SRCS= umad.c +LIBADD= ibcommon CFLAGS+= -DHAVE_CONFIG_H VERSION_MAP= ${IBSRCDIR}/libibumad.map Modified: head/contrib/ofed/usr.lib/libmlx4/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libmlx4/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.lib/libmlx4/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -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 Modified: head/contrib/ofed/usr.lib/libmthca/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libmthca/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.lib/libmthca/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -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 Modified: head/contrib/ofed/usr.lib/libopensm/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libopensm/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.lib/libopensm/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -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> Modified: head/contrib/ofed/usr.lib/libosmcomp/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libosmcomp/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.lib/libosmcomp/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -16,6 +16,8 @@ SRCS+= cl_log.c cl_map.c cl_pool.c cl_pt 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> Modified: head/contrib/ofed/usr.lib/libosmvendor/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libosmvendor/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.lib/libosmvendor/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -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 Modified: head/contrib/ofed/usr.lib/librdmacm/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/librdmacm/Makefile Fri Mar 4 22:37:00 2016 (r296397) +++ head/contrib/ofed/usr.lib/librdmacm/Makefile Fri Mar 4 22:37:09 2016 (r296398) @@ -27,6 +27,7 @@ MAN+= rdma_resolve_route.3 rdma_disconne 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 Modified: head/share/mk/src.libnames.mk ============================================================================== --- head/share/mk/src.libnames.mk Fri Mar 4 22:37:00 2016 (r296397) +++ head/share/mk/src.libnames.mk Fri Mar 4 22:37:09 2016 (r296398) @@ -312,6 +312,18 @@ _DP_zfs= md pthread umem util uutil m nv 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++
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603042237.u24MbA8S052813>