svn commit: r292037 - in head: contrib/ofed/usr.bin/ibaddr contrib/ofed/usr.bin/ibnetdiscover contrib/ofed/usr.bin/ibping contrib/ofed/usr.bin/ibportstate contrib/ofed/usr.bin/ibroute contrib/ofed/...

Bryan Drewery bdrewery at FreeBSD.org
Thu Dec 10 00:07:15 UTC 2015 

Author: bdrewery
Date: Thu Dec 10 00:07:11 2015
New Revision: 292037
URL: https://svnweb.freebsd.org/changeset/base/292037

Log:
  Convert contrib/ofed libraries to LIBADD.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/contrib/ofed/usr.bin/ibaddr/Makefile
  head/contrib/ofed/usr.bin/ibnetdiscover/Makefile
  head/contrib/ofed/usr.bin/ibping/Makefile
  head/contrib/ofed/usr.bin/ibportstate/Makefile
  head/contrib/ofed/usr.bin/ibroute/Makefile
  head/contrib/ofed/usr.bin/ibsendtrap/Makefile
  head/contrib/ofed/usr.bin/ibstat/Makefile
  head/contrib/ofed/usr.bin/ibsysstat/Makefile
  head/contrib/ofed/usr.bin/ibtracert/Makefile
  head/contrib/ofed/usr.bin/opensm/Makefile
  head/contrib/ofed/usr.bin/osmtest/Makefile
  head/contrib/ofed/usr.bin/perfquery/Makefile
  head/contrib/ofed/usr.bin/saquery/Makefile
  head/contrib/ofed/usr.bin/sminfo/Makefile
  head/contrib/ofed/usr.bin/smpdump/Makefile
  head/contrib/ofed/usr.bin/smpquery/Makefile
  head/contrib/ofed/usr.bin/vendstat/Makefile
  head/share/mk/bsd.libnames.mk
  head/share/mk/src.libnames.mk

Modified: head/contrib/ofed/usr.bin/ibaddr/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/ibaddr/Makefile	Thu Dec 10 00:07:05 2015	(r292036)
+++ head/contrib/ofed/usr.bin/ibaddr/Makefile	Thu Dec 10 00:07:11 2015	(r292037)
@@ -5,7 +5,7 @@
 
 PROG=   ibaddr
 SRCS=   ibaddr.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad
+LIBADD= ibumad ibcommon ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibaddr.8
 

Modified: head/contrib/ofed/usr.bin/ibnetdiscover/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/ibnetdiscover/Makefile	Thu Dec 10 00:07:05 2015	(r292036)
+++ head/contrib/ofed/usr.bin/ibnetdiscover/Makefile	Thu Dec 10 00:07:11 2015	(r292037)
@@ -5,8 +5,8 @@
 
 PROG=   ibnetdiscover
 SRCS=   ibnetdiscover.c grouping.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad -losmcomp
-CFLAGS+= -pthread -I${DIAGPATH}/include
+LIBADD= ibumad ibcommon ibmad osmcomp pthread
+CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibnetdiscover.8
 
 WARNS?= 1

Modified: head/contrib/ofed/usr.bin/ibping/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/ibping/Makefile	Thu Dec 10 00:07:05 2015	(r292036)
+++ head/contrib/ofed/usr.bin/ibping/Makefile	Thu Dec 10 00:07:11 2015	(r292037)
@@ -5,7 +5,7 @@
 
 PROG=   ibping
 SRCS=   ibping.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad
+LIBADD= ibumad ibcommon ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibping.8
 

Modified: head/contrib/ofed/usr.bin/ibportstate/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/ibportstate/Makefile	Thu Dec 10 00:07:05 2015	(r292036)
+++ head/contrib/ofed/usr.bin/ibportstate/Makefile	Thu Dec 10 00:07:11 2015	(r292037)
@@ -5,7 +5,7 @@
 
 PROG=   ibportstate
 SRCS=   ibportstate.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad
+LIBADD= ibumad ibcommon ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibportstate.8
 

Modified: head/contrib/ofed/usr.bin/ibroute/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/ibroute/Makefile	Thu Dec 10 00:07:05 2015	(r292036)
+++ head/contrib/ofed/usr.bin/ibroute/Makefile	Thu Dec 10 00:07:11 2015	(r292037)
@@ -5,8 +5,8 @@
 
 PROG=   ibroute
 SRCS=   ibroute.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad -losmcomp
-CFLAGS+= -pthread -I${DIAGPATH}/include
+LIBADD= ibumad ibcommon ibmad osmcomp pthread
+CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibroute.8
 
 WARNS?= 1

Modified: head/contrib/ofed/usr.bin/ibsendtrap/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/ibsendtrap/Makefile	Thu Dec 10 00:07:05 2015	(r292036)
+++ head/contrib/ofed/usr.bin/ibsendtrap/Makefile	Thu Dec 10 00:07:11 2015	(r292037)
@@ -5,7 +5,7 @@
 
 PROG=   ibsendtrap
 SRCS=   ibsendtrap.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad
+LIBADD= ibumad ibcommon ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=
 

Modified: head/contrib/ofed/usr.bin/ibstat/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/ibstat/Makefile	Thu Dec 10 00:07:05 2015	(r292036)
+++ head/contrib/ofed/usr.bin/ibstat/Makefile	Thu Dec 10 00:07:11 2015	(r292037)
@@ -5,7 +5,7 @@
 
 PROG=   ibstat
 SRCS=   ibstat.c
-LDADD=	-libumad -libcommon
+LIBADD= ibumad ibcommon
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibstat.8
 

Modified: head/contrib/ofed/usr.bin/ibsysstat/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/ibsysstat/Makefile	Thu Dec 10 00:07:05 2015	(r292036)
+++ head/contrib/ofed/usr.bin/ibsysstat/Makefile	Thu Dec 10 00:07:11 2015	(r292037)
@@ -5,7 +5,7 @@
 
 PROG=   ibsysstat
 SRCS=   ibsysstat.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad
+LIBADD= ibumad ibcommon ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibsysstat.8
 

Modified: head/contrib/ofed/usr.bin/ibtracert/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/ibtracert/Makefile	Thu Dec 10 00:07:05 2015	(r292036)
+++ head/contrib/ofed/usr.bin/ibtracert/Makefile	Thu Dec 10 00:07:11 2015	(r292037)
@@ -5,8 +5,8 @@
 
 PROG=   ibtracert
 SRCS=   ibtracert.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad -losmcomp
-CFLAGS+= -pthread -I${DIAGPATH}/include
+LIBADD= ibumad ibcommon ibmad osmcomp pthread
+CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibtracert.8
 
 WARNS?= 1

Modified: head/contrib/ofed/usr.bin/opensm/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/opensm/Makefile	Thu Dec 10 00:07:05 2015	(r292036)
+++ head/contrib/ofed/usr.bin/opensm/Makefile	Thu Dec 10 00:07:11 2015	(r292037)
@@ -29,8 +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
 
-LDADD=	-lopensm -losmvendor -losmcomp -libmad -libumad -libcommon
-CFLAGS+= -pthread
+LIBADD= opensm osmvendor osmcomp ibmad ibumad ibcommon pthread
 CFLAGS+= -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP
 
 MAN=	opensm.8

Modified: head/contrib/ofed/usr.bin/osmtest/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/osmtest/Makefile	Thu Dec 10 00:07:05 2015	(r292036)
+++ head/contrib/ofed/usr.bin/osmtest/Makefile	Thu Dec 10 00:07:11 2015	(r292037)
@@ -16,14 +16,7 @@ SRCS=	main.c \
 	osmt_slvl_vl_arb.c \
 	osmtest.c
 
-LDADD=	-libcommon \
-	-libmad \
-	-libumad \
-	-losmvendor \
-	-losmcomp \
-	-lopensm \
-
-LIBADD+= pthread
+LIBADD= ibcommon ibmad ibumad osmvendor osmcomp opensm pthread
 
 CFLAGS=	-DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP \
 	-I${OPENSM}/osmtest/include

Modified: head/contrib/ofed/usr.bin/perfquery/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/perfquery/Makefile	Thu Dec 10 00:07:05 2015	(r292036)
+++ head/contrib/ofed/usr.bin/perfquery/Makefile	Thu Dec 10 00:07:11 2015	(r292037)
@@ -5,7 +5,7 @@
 
 PROG=   perfquery
 SRCS=   perfquery.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad
+LIBADD= ibumad ibcommon ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	perfquery.8
 

Modified: head/contrib/ofed/usr.bin/saquery/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/saquery/Makefile	Thu Dec 10 00:07:05 2015	(r292036)
+++ head/contrib/ofed/usr.bin/saquery/Makefile	Thu Dec 10 00:07:11 2015	(r292037)
@@ -5,10 +5,9 @@
 
 PROG=   saquery
 SRCS=   saquery.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad -losmcomp -losmvendor -lopensm
+LIBADD= ibumad ibcommon ibmad osmcomp osmvendor opensm pthread
 CFLAGS+= -I${DIAGPATH}/include
 CFLAGS+= -DOSM_VENDOR_INTF_OPENIB -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP
-CFLAGS+= -pthread
 MAN=	saquery.8
 
 WARNS?= 1

Modified: head/contrib/ofed/usr.bin/sminfo/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/sminfo/Makefile	Thu Dec 10 00:07:05 2015	(r292036)
+++ head/contrib/ofed/usr.bin/sminfo/Makefile	Thu Dec 10 00:07:11 2015	(r292037)
@@ -5,7 +5,7 @@
 
 PROG=   sminfo
 SRCS=   sminfo.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad
+LIBADD= ibumad ibcommon ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	sminfo.8
 

Modified: head/contrib/ofed/usr.bin/smpdump/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/smpdump/Makefile	Thu Dec 10 00:07:05 2015	(r292036)
+++ head/contrib/ofed/usr.bin/smpdump/Makefile	Thu Dec 10 00:07:11 2015	(r292037)
@@ -5,7 +5,7 @@
 
 PROG=   smpdump
 SRCS=   smpdump.c
-LDADD=	-libumad -libcommon -libmad
+LIBADD= ibumad ibcommon ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	smpdump.8
 

Modified: head/contrib/ofed/usr.bin/smpquery/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/smpquery/Makefile	Thu Dec 10 00:07:05 2015	(r292036)
+++ head/contrib/ofed/usr.bin/smpquery/Makefile	Thu Dec 10 00:07:11 2015	(r292037)
@@ -5,8 +5,8 @@
 
 PROG=   smpquery
 SRCS=   smpquery.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad -losmcomp
-CFLAGS+= -pthread -I${DIAGPATH}/include
+LIBADD= ibumad ibcommon ibmad osmcomp pthread
+CFLAGS+= -I${DIAGPATH}/include
 MAN=	smpquery.8
 
 WARNS?= 1

Modified: head/contrib/ofed/usr.bin/vendstat/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/vendstat/Makefile	Thu Dec 10 00:07:05 2015	(r292036)
+++ head/contrib/ofed/usr.bin/vendstat/Makefile	Thu Dec 10 00:07:11 2015	(r292037)
@@ -5,7 +5,7 @@
 
 PROG=   vendstat
 SRCS=   vendstat.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad
+LIBADD= ibumad ibcommon ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	vendstat.8
 

Modified: head/share/mk/bsd.libnames.mk
==============================================================================
--- head/share/mk/bsd.libnames.mk	Thu Dec 10 00:07:05 2015	(r292036)
+++ head/share/mk/bsd.libnames.mk	Thu Dec 10 00:07:11 2015	(r292037)
@@ -41,6 +41,7 @@ LIBCRYPTO?=	${DESTDIR}${LIBDIR}/libcrypt
 LIBCTF?=	${DESTDIR}${LIBDIR}/libctf.a
 LIBCURSES?=	${DESTDIR}${LIBDIR}/libcurses.a
 LIBCUSE?=	${DESTDIR}${LIBDIR}/libcuse.a
+LIBCXGB4?=	${DESTDIR}${LIBDIR}/libcxgb4.a
 LIBCXXRT?=	${DESTDIR}${LIBDIR}/libcxxrt.a
 LIBC_PIC?=	${DESTDIR}${LIBDIR}/libc_pic.a
 LIBDEVCTL?=	${DESTDIR}${LIBDIR}/libdevctl.a
@@ -69,6 +70,12 @@ LIBHEIMBASE?=	${DESTDIR}${LIBDIR}/libhei
 LIBHEIMNTLM?=	${DESTDIR}${LIBDIR}/libheimntlm.a
 LIBHEIMSQLITE?=	${DESTDIR}${LIBDIR}/libheimsqlite.a
 LIBHX509?=	${DESTDIR}${LIBDIR}/libhx509.a
+LIBIBCM?=	${DESTDIR}${LIBDIR}/libibcm.a
+LIBIBCOMMON?=	${DESTDIR}${LIBDIR}/libibcommon.a
+LIBIBMAD?=	${DESTDIR}${LIBDIR}/libibmad.a
+LIBIBSDP?=	${DESTDIR}${LIBDIR}/libibsdp.a
+LIBIBUMAD?=	${DESTDIR}${LIBDIR}/libibumad.a
+LIBIBVERBS?=	${DESTDIR}${LIBDIR}/libibverbs.a
 LIBIPSEC?=	${DESTDIR}${LIBDIR}/libipsec.a
 LIBJAIL?=	${DESTDIR}${LIBDIR}/libjail.a
 LIBKADM5CLNT?=	${DESTDIR}${LIBDIR}/libkadm5clnt.a
@@ -88,8 +95,10 @@ LIBMD?=		${DESTDIR}${LIBDIR}/libmd.a
 LIBMEMSTAT?=	${DESTDIR}${LIBDIR}/libmemstat.a
 LIBMENU?=	${DESTDIR}${LIBDIR}/libmenu.a
 LIBMILTER?=	${DESTDIR}${LIBDIR}/libmilter.a
+LIBMLX4?=	${DESTDIR}${LIBDIR}/libmlx4.a
 LIBMP?=		${DESTDIR}${LIBDIR}/libmp.a
 LIBMT?=		${DESTDIR}${LIBDIR}/libmt.a
+LIBMTHCA?=	${DESTDIR}${LIBDIR}/libmthca.a
 LIBNANDFS?=	${DESTDIR}${LIBDIR}/libnandfs.a
 LIBNCURSES?=	${DESTDIR}${LIBDIR}/libncurses.a
 LIBNCURSESW?=	${DESTDIR}${LIBDIR}/libncursesw.a
@@ -97,7 +106,10 @@ LIBNETGRAPH?=	${DESTDIR}${LIBDIR}/libnet
 LIBNGATM?=	${DESTDIR}${LIBDIR}/libngatm.a
 LIBNV?=		${DESTDIR}${LIBDIR}/libnv.a
 LIBNVPAIR?=	${DESTDIR}${LIBDIR}/libnvpair.a
+LIBOPENSM?=	${DESTDIR}${LIBDIR}/libopensm.a
 LIBOPIE?=	${DESTDIR}${LIBDIR}/libopie.a
+LIBOSMCOMP?=	${DESTDIR}${LIBDIR}/libosmcomp.a
+LIBOSMVENDOR?=	${DESTDIR}${LIBDIR}/libosmvendor.a
 LIBPAM?=	${DESTDIR}${LIBDIR}/libpam.a
 LIBPANEL?=	${DESTDIR}${LIBDIR}/libpanel.a
 LIBPANELW?=	${DESTDIR}${LIBDIR}/libpanelw.a
@@ -108,6 +120,7 @@ LIBPROC?=	${DESTDIR}${LIBDIR}/libproc.a
 LIBPROCSTAT?=	${DESTDIR}${LIBDIR}/libprocstat.a
 LIBPTHREAD?=	${DESTDIR}${LIBDIR}/libpthread.a
 LIBRADIUS?=	${DESTDIR}${LIBDIR}/libradius.a
+LIBRDMACM?=	${DESTDIR}${LIBDIR}/librdmacm.a
 LIBROKEN?=	${DESTDIR}${LIBDIR}/libroken.a
 LIBRPCSEC_GSS?=	${DESTDIR}${LIBDIR}/librpcsec_gss.a
 LIBRPCSVC?=	${DESTDIR}${LIBDIR}/librpcsvc.a

Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk	Thu Dec 10 00:07:05 2015	(r292036)
+++ head/share/mk/src.libnames.mk	Thu Dec 10 00:07:11 2015	(r292037)
@@ -169,6 +169,23 @@ _LIBRARIES=	\
 		zfs \
 		zpool \
 
+.if ${MK_OFED} != "no"
+_LIBRARIES+= \
+		cxgb4 \
+		ibcm \
+		ibcommon \
+		ibmad \
+		ibsdp \
+		ibumad \
+		ibverbs \
+		mlx4 \
+		mthca \
+		opensm \
+		osmcomp \
+		osmvendor \
+		rdmacm \
+
+.endif
 
 # Each library's LIBADD needs to be duplicated here for static linkage of
 # 2nd+ order consumers.  Auto-generating this would be better.
@@ -416,6 +433,19 @@ 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
+LIBMTHCADIR=	${OBJTOP}/contrib/ofed/usr.lib/libmthca
+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
 LIBDIALOGDIR=	${OBJTOP}/gnu/lib/libdialog
 LIBGCOVDIR=	${OBJTOP}/gnu/lib/libgcov
 LIBGOMPDIR=	${OBJTOP}/gnu/lib/libgomp

More information about the svn-src-head mailing list