From 400b94bbebf157a704a39c9799dd3d8f20952a99 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Fri, 4 Mar 2016 22:37:09 +0000 Subject: [PATCH] Fix over/under-linking in contrib/ofed. Sponsored by: EMC / Isilon Storage Division --- Makefile.inc1 | 11 ++++++++++- contrib/ofed/usr.bin/ibaddr/Makefile | 2 +- contrib/ofed/usr.bin/ibnetdiscover/Makefile | 2 +- contrib/ofed/usr.bin/ibroute/Makefile | 2 +- contrib/ofed/usr.bin/ibsendtrap/Makefile | 2 +- contrib/ofed/usr.bin/ibtracert/Makefile | 2 +- contrib/ofed/usr.bin/opensm/Makefile | 2 +- contrib/ofed/usr.bin/saquery/Makefile | 2 +- contrib/ofed/usr.bin/sminfo/Makefile | 2 +- contrib/ofed/usr.bin/smpquery/Makefile | 2 +- contrib/ofed/usr.bin/vendstat/Makefile | 2 +- contrib/ofed/usr.lib/Makefile | 8 ++++++++ contrib/ofed/usr.lib/libcxgb4/Makefile | 1 + contrib/ofed/usr.lib/libibcm/Makefile | 1 + contrib/ofed/usr.lib/libibmad/Makefile | 1 + contrib/ofed/usr.lib/libibumad/Makefile | 1 + contrib/ofed/usr.lib/libmlx4/Makefile | 1 + contrib/ofed/usr.lib/libmthca/Makefile | 2 +- contrib/ofed/usr.lib/libopensm/Makefile | 2 ++ contrib/ofed/usr.lib/libosmcomp/Makefile | 2 ++ contrib/ofed/usr.lib/libosmvendor/Makefile | 1 + contrib/ofed/usr.lib/librdmacm/Makefile | 1 + share/mk/src.libnames.mk | 12 ++++++++++++ 23 files changed, 52 insertions(+), 12 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index d4f1bfdbd82..ffa3f005197 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 2270900a17b..a50eefa4149 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 f77c6ec2bb1..e724341e3f1 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 ab73621fe81..bac51946e54 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 33ac49a94a2..8f947224769 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 9c4a494ec73..821966f7a3d 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 4dd1b063c42..5b0bcb0ff5d 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 210224a0afc..215574810f2 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 0ec6656389b..72e930d2209 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 f08df7d4fc9..01acbe2a437 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 df18313bc69..48cda6b3550 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 b9c249e2966..47b97591f5b 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 diff --git a/contrib/ofed/usr.lib/libcxgb4/Makefile b/contrib/ofed/usr.lib/libcxgb4/Makefile index d4619e78ec3..3c75043675e 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 c07fcf0c132..5f895d08463 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 43c66c35631..4ccdb4f0874 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 b420b1c7fb2..daa12c02fec 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 9959ec92296..b4adc4cbc32 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 4d0c6072725..d81d7cd0e6f 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 7d2a5247f9e..a1c60025727 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 diff --git a/contrib/ofed/usr.lib/libosmcomp/Makefile b/contrib/ofed/usr.lib/libosmcomp/Makefile index 373e9beed4e..1d068303a61 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 diff --git a/contrib/ofed/usr.lib/libosmvendor/Makefile b/contrib/ofed/usr.lib/libosmvendor/Makefile index 62cd8daffe7..e277def1d19 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 560931f7529..384562230ab 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 fad58d15c6f..ad617875737 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++