Date: Mon, 13 Nov 2017 11:36:22 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r325762 - in projects/bsd_rdma_4_9/contrib/ofed: . infiniband-diags/build infiniband-diags/build/dump_fts infiniband-diags/build/ibcacheedit infiniband-diags/build/iblinkinfo infiniband... Message-ID: <201711131136.vADBaMGQ095300@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Mon Nov 13 11:36:22 2017 New Revision: 325762 URL: https://svnweb.freebsd.org/changeset/base/325762 Log: Remove no longer needed TESTBUILD defines from OFED Makefiles. Sponsored by: Mellanox Technologies Modified: projects/bsd_rdma_4_9/contrib/ofed/Makefile projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/Makefile.inc projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/dump_fts/Makefile projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibcacheedit/Makefile projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/iblinkinfo/Makefile projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibnetdiscover/Makefile projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibqueryerrors/Makefile projects/bsd_rdma_4_9/contrib/ofed/libcxgb4/Makefile projects/bsd_rdma_4_9/contrib/ofed/libibcm/Makefile projects/bsd_rdma_4_9/contrib/ofed/libibmad/Makefile projects/bsd_rdma_4_9/contrib/ofed/libibnetdisc/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/libopensm/Makefile projects/bsd_rdma_4_9/contrib/ofed/opensm/libvendor/Makefile projects/bsd_rdma_4_9/contrib/ofed/opensm/opensm/Makefile Modified: projects/bsd_rdma_4_9/contrib/ofed/Makefile ============================================================================== --- projects/bsd_rdma_4_9/contrib/ofed/Makefile Mon Nov 13 10:59:38 2017 (r325761) +++ projects/bsd_rdma_4_9/contrib/ofed/Makefile Mon Nov 13 11:36:22 2017 (r325762) @@ -44,12 +44,4 @@ SUBDIR+= ${SUBDIR_${L}} SUBDIR_PARALLEL= -.if defined(TESTBUILD) -all-install: -.for D in ${SUBDIR} - cd ${.CURDIR}/${D} ; ${MAKE} clean cleandepend - cd ${.CURDIR}/${D} ; ${MAKE} depend all install -.endfor -.else .include <bsd.subdir.mk> -.endif Modified: projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/Makefile.inc ============================================================================== --- projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/Makefile.inc Mon Nov 13 10:59:38 2017 (r325761) +++ projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/Makefile.inc Mon Nov 13 11:36:22 2017 (r325762) @@ -8,9 +8,5 @@ CFLAGS+= -I${INCLUDEDIR}/infiniband CFLAGS+= -DHAVE_CONFIG_H=1 CFLAGS+= -I${.CURDIR}/../../ CFLAGS+= -I${.CURDIR}/../../src -.if defined(TESTBUILD) -LDFLAGS+= -losmcomp -libmad -libumad -.else LIBADD+= osmcomp ibmad ibumad -.endif Modified: projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/dump_fts/Makefile ============================================================================== --- projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/dump_fts/Makefile Mon Nov 13 10:59:38 2017 (r325761) +++ projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/dump_fts/Makefile Mon Nov 13 11:36:22 2017 (r325762) @@ -2,11 +2,7 @@ PROG= dump_fts SRCS= dump_fts.c -.if defined(TESTBUILD) -LDFLAGS= -libnetdisc -.else LIBADD= ibnetdisc -.endif MAN= dump_fts.8 .include <bsd.prog.mk> Modified: projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibcacheedit/Makefile ============================================================================== --- projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibcacheedit/Makefile Mon Nov 13 10:59:38 2017 (r325761) +++ projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibcacheedit/Makefile Mon Nov 13 11:36:22 2017 (r325762) @@ -2,11 +2,7 @@ PROG= ibcacheedit SRCS= ibcacheedit.c -.if defined(TESTBUILD) -LDFLAGS= -libnetdisc -.else LIBADD= ibnetdisc -.endif MAN= ibcacheedit.8 .include <bsd.prog.mk> Modified: projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/iblinkinfo/Makefile ============================================================================== --- projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/iblinkinfo/Makefile Mon Nov 13 10:59:38 2017 (r325761) +++ projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/iblinkinfo/Makefile Mon Nov 13 11:36:22 2017 (r325762) @@ -2,11 +2,7 @@ PROG= iblinkinfo SRCS= iblinkinfo.c -.if defined(TESTBUILD) -LDFLAGS= -libnetdisc -.else LIBADD= ibnetdisc -.endif MAN= iblinkinfo.8 .include <bsd.prog.mk> Modified: projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibnetdiscover/Makefile ============================================================================== --- projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibnetdiscover/Makefile Mon Nov 13 10:59:38 2017 (r325761) +++ projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibnetdiscover/Makefile Mon Nov 13 11:36:22 2017 (r325762) @@ -2,11 +2,7 @@ PROG= ibnetdiscover SRCS= ibnetdiscover.c -.if defined(TESTBUILD) -LDFLAGS= -libnetdisc -.else LIBADD= ibnetdisc -.endif MAN= ibnetdiscover.8 .include <bsd.prog.mk> Modified: projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibqueryerrors/Makefile ============================================================================== --- projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibqueryerrors/Makefile Mon Nov 13 10:59:38 2017 (r325761) +++ projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibqueryerrors/Makefile Mon Nov 13 11:36:22 2017 (r325762) @@ -2,11 +2,7 @@ PROG= ibqueryerrors SRCS= ibqueryerrors.c -.if defined(TESTBUILD) -LDFLAGS= -libnetdisc -.else LIBADD= ibnetdisc -.endif MAN= ibqueryerrors.8 .include <bsd.prog.mk> Modified: projects/bsd_rdma_4_9/contrib/ofed/libcxgb4/Makefile ============================================================================== --- projects/bsd_rdma_4_9/contrib/ofed/libcxgb4/Makefile Mon Nov 13 10:59:38 2017 (r325761) +++ projects/bsd_rdma_4_9/contrib/ofed/libcxgb4/Makefile Mon Nov 13 11:36:22 2017 (r325762) @@ -13,11 +13,7 @@ dev.c \ qp.c \ verbs.c -.if defined(TESTBUILD) -LDFLAGS= -libverbs -lpthread -.else LIBADD= ibverbs pthread -.endif CFLAGS+= -I${.CURDIR} .include <bsd.lib.mk> Modified: projects/bsd_rdma_4_9/contrib/ofed/libibcm/Makefile ============================================================================== --- projects/bsd_rdma_4_9/contrib/ofed/libibcm/Makefile Mon Nov 13 10:59:38 2017 (r325761) +++ projects/bsd_rdma_4_9/contrib/ofed/libibcm/Makefile Mon Nov 13 11:36:22 2017 (r325762) @@ -7,11 +7,7 @@ LIB= ibcm SHLIB_MAJOR= 1 MK_PROFILE= no SRCS= cm.c -.if defined(TESTBUILD) -LDFLAGS= -libverbs -.else LDADD= ibverbs -.endif CFLAGS+= -I${.CURDIR} MAN= VERSION_MAP= ${.CURDIR}/libibcm.map Modified: projects/bsd_rdma_4_9/contrib/ofed/libibmad/Makefile ============================================================================== --- projects/bsd_rdma_4_9/contrib/ofed/libibmad/Makefile Mon Nov 13 10:59:38 2017 (r325761) +++ projects/bsd_rdma_4_9/contrib/ofed/libibmad/Makefile Mon Nov 13 11:36:22 2017 (r325762) @@ -23,11 +23,7 @@ serv.c \ smp.c \ vendor.c -.if defined(TESTBUILD) -LDFLAGS= -libumad -.else LIBADD= ibumad -.endif CFLAGS+= -DHAVE_CONFIG_H=1 CFLAGS+= -I${.CURDIR} VERSION_MAP= ${.CURDIR}/libibmad.map Modified: projects/bsd_rdma_4_9/contrib/ofed/libibnetdisc/Makefile ============================================================================== --- projects/bsd_rdma_4_9/contrib/ofed/libibnetdisc/Makefile Mon Nov 13 10:59:38 2017 (r325761) +++ projects/bsd_rdma_4_9/contrib/ofed/libibnetdisc/Makefile Mon Nov 13 11:36:22 2017 (r325762) @@ -24,11 +24,7 @@ ibnd_iter_nodes.3 \ ibnd_iter_nodes_type.3 \ ibnd_show_progress.3 -.if defined(TESTBUILD) -LDFLAGS= -losmcomp -libmad -libumad -.else LIBADD= osmcomp ibmad ibumad -.endif CFLAGS+= -DHAVE_CONFIG_H=1 CFLAGS+= -I${.CURDIR} CFLAGS+= -I${INCLUDEDIR}/infiniband Modified: projects/bsd_rdma_4_9/contrib/ofed/libmlx4/Makefile ============================================================================== --- projects/bsd_rdma_4_9/contrib/ofed/libmlx4/Makefile Mon Nov 13 10:59:38 2017 (r325761) +++ projects/bsd_rdma_4_9/contrib/ofed/libmlx4/Makefile Mon Nov 13 11:36:22 2017 (r325762) @@ -16,11 +16,7 @@ qp.c \ srq.c \ verbs.c -.if defined(TESTBUILD) -LDFLAGS= -libverbs -lpthread -.else LDADD= ibverbs pthread -.endif 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 10:59:38 2017 (r325761) +++ projects/bsd_rdma_4_9/contrib/ofed/libmlx5/Makefile Mon Nov 13 11:36:22 2017 (r325762) @@ -16,11 +16,7 @@ qp.c \ srq.c \ verbs.c -.if defined(TESTBUILD) -LDFLAGS= -libverbs -lpthread -.else LDADD= ibverbs pthread -.endif 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 10:59:38 2017 (r325761) +++ projects/bsd_rdma_4_9/contrib/ofed/librdmacm/Makefile Mon Nov 13 11:36:22 2017 (r325762) @@ -65,11 +65,7 @@ rdma_resolve_addr.3 \ rdma_resolve_route.3 \ rdma_set_option.3 -.if defined(TESTBUILD) -LDFLAGS= -libverbs -.else LDADD= ibverbs -.endif 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 10:59:38 2017 (r325761) +++ projects/bsd_rdma_4_9/contrib/ofed/opensm/complib/Makefile Mon Nov 13 11:36:22 2017 (r325762) @@ -28,11 +28,7 @@ ib_statustext.c CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1 CFLAGS+= -I${INCLUDEDIR}/infiniband -.if defined(TESTBUILD) -LDFLAGS= -lpthread -.else LDADD= pthread -.endif VERSION_MAP= ${.CURDIR}/libosmcomp.map .include <bsd.lib.mk> Modified: projects/bsd_rdma_4_9/contrib/ofed/opensm/libopensm/Makefile ============================================================================== --- projects/bsd_rdma_4_9/contrib/ofed/opensm/libopensm/Makefile Mon Nov 13 10:59:38 2017 (r325761) +++ projects/bsd_rdma_4_9/contrib/ofed/opensm/libopensm/Makefile Mon Nov 13 11:36:22 2017 (r325762) @@ -12,11 +12,7 @@ osm_log.c \ osm_mad_pool.c \ osm_helper.c -.if defined(TESTBUILD) -LDFLAGS= -lpthread -.else LIBADD= pthread -.endif CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1 CFLAGS+= -I${INCLUDEDIR}/infiniband VERSION_MAP= ${.CURDIR}/../opensm/libopensm.map Modified: projects/bsd_rdma_4_9/contrib/ofed/opensm/libvendor/Makefile ============================================================================== --- projects/bsd_rdma_4_9/contrib/ofed/opensm/libvendor/Makefile Mon Nov 13 10:59:38 2017 (r325761) +++ projects/bsd_rdma_4_9/contrib/ofed/opensm/libvendor/Makefile Mon Nov 13 11:36:22 2017 (r325762) @@ -11,11 +11,7 @@ SRCS= \ osm_vendor_ibumad.c \ osm_vendor_ibumad_sa.c -.if defined(TESTBUILD) -LDFLAGS= -libumad -lpthread -.else LIBADD= ibumad pthread -.endif CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1 CFLAGS+= -I${INCLUDEDIR}/infiniband VERSION_MAP= ${.CURDIR}/libosmvendor.map Modified: projects/bsd_rdma_4_9/contrib/ofed/opensm/opensm/Makefile ============================================================================== --- projects/bsd_rdma_4_9/contrib/ofed/opensm/opensm/Makefile Mon Nov 13 10:59:38 2017 (r325761) +++ projects/bsd_rdma_4_9/contrib/ofed/opensm/opensm/Makefile Mon Nov 13 11:36:22 2017 (r325762) @@ -96,10 +96,6 @@ st.c MAN= opensm.8 CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1 CFLAGS+= -I${INCLUDEDIR}/infiniband -.if defined(TESTBUILD) -LDFLAGS= -lopensm -losmvendor -losmcomp -lwrap -lpthread -.else LDADD= opensm osmvendor osmcomp wrap pthread -.endif .include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711131136.vADBaMGQ095300>