svn commit: r335253 - in head: . contrib/ofed contrib/ofed/include contrib/ofed/infiniband-diags/build contrib/ofed/libcxgb4 contrib/ofed/libibcm contrib/ofed/libibmad contrib/ofed/libibnetdisc con...
Konstantin Belousov
kib at FreeBSD.org
Sat Jun 16 15:05:18 UTC 2018
Author: kib
Date: Sat Jun 16 15:05:05 2018
New Revision: 335253
URL: https://svnweb.freebsd.org/changeset/base/335253
Log:
Rework ofed build.
Aligns the build with the FreeBSD traditional approach to not build in
contrib/, and to track inter-dependencies between libraries.
With help from: bdrewery
Reviewed by: bdrewery, hselasky
Sponsored by: Mellanox Technologies
MFC after: 2 weeks
Differential revision: https://reviews.freebsd.org/D15648
Added:
head/lib/ofed/
head/lib/ofed/Makefile (contents, props changed)
head/lib/ofed/Makefile.inc (contents, props changed)
head/lib/ofed/complib/
head/lib/ofed/complib/Makefile
- copied, changed from r335252, head/contrib/ofed/opensm/complib/Makefile
head/lib/ofed/include/
head/lib/ofed/include/Makefile
- copied, changed from r335252, head/contrib/ofed/include/Makefile
head/lib/ofed/libcxgb4/
head/lib/ofed/libcxgb4/Makefile
- copied, changed from r335252, head/contrib/ofed/libcxgb4/Makefile
head/lib/ofed/libibcm/
head/lib/ofed/libibcm/Makefile
- copied, changed from r335252, head/contrib/ofed/libibcm/Makefile
head/lib/ofed/libibmad/
head/lib/ofed/libibmad/Makefile
- copied, changed from r335252, head/contrib/ofed/libibmad/Makefile
head/lib/ofed/libibnetdisc/
head/lib/ofed/libibnetdisc/Makefile
- copied, changed from r335252, head/contrib/ofed/libibnetdisc/Makefile
head/lib/ofed/libibumad/
head/lib/ofed/libibumad/Makefile
- copied, changed from r335252, head/contrib/ofed/libibumad/Makefile
head/lib/ofed/libibverbs/
head/lib/ofed/libibverbs/Makefile
- copied, changed from r335252, head/contrib/ofed/libibverbs/Makefile
head/lib/ofed/libmlx4/
head/lib/ofed/libmlx4/Makefile
- copied, changed from r335252, head/contrib/ofed/libmlx4/Makefile
head/lib/ofed/libmlx5/
head/lib/ofed/libmlx5/Makefile
- copied, changed from r335252, head/contrib/ofed/libmlx5/Makefile
head/lib/ofed/libopensm/
head/lib/ofed/libopensm/Makefile
- copied, changed from r335252, head/contrib/ofed/opensm/libopensm/Makefile
head/lib/ofed/librdmacm/
head/lib/ofed/librdmacm/Makefile
- copied, changed from r335252, head/contrib/ofed/librdmacm/Makefile
head/lib/ofed/libvendor/
head/lib/ofed/libvendor/Makefile
- copied, changed from r335252, head/contrib/ofed/opensm/libvendor/Makefile
head/usr.bin/ofed/
head/usr.bin/ofed/Makefile (contents, props changed)
head/usr.bin/ofed/infiniband-diags/
head/usr.bin/ofed/infiniband-diags/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/Makefile
head/usr.bin/ofed/infiniband-diags/Makefile.inc
- copied, changed from r335252, head/contrib/ofed/infiniband-diags/build/Makefile.inc
head/usr.bin/ofed/infiniband-diags/dump_fts/
head/usr.bin/ofed/infiniband-diags/dump_fts/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/dump_fts/Makefile
head/usr.bin/ofed/infiniband-diags/ibaddr/
head/usr.bin/ofed/infiniband-diags/ibaddr/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/ibaddr/Makefile
head/usr.bin/ofed/infiniband-diags/ibcacheedit/
head/usr.bin/ofed/infiniband-diags/ibcacheedit/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/ibcacheedit/Makefile
head/usr.bin/ofed/infiniband-diags/ibccconfig/
head/usr.bin/ofed/infiniband-diags/ibccconfig/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/ibccconfig/Makefile
head/usr.bin/ofed/infiniband-diags/ibccquery/
head/usr.bin/ofed/infiniband-diags/ibccquery/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/ibccquery/Makefile
head/usr.bin/ofed/infiniband-diags/iblinkinfo/
head/usr.bin/ofed/infiniband-diags/iblinkinfo/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/iblinkinfo/Makefile
head/usr.bin/ofed/infiniband-diags/ibmirror/
head/usr.bin/ofed/infiniband-diags/ibmirror/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/ibmirror/Makefile
head/usr.bin/ofed/infiniband-diags/ibnetdiscover/
head/usr.bin/ofed/infiniband-diags/ibnetdiscover/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/ibnetdiscover/Makefile
head/usr.bin/ofed/infiniband-diags/ibping/
head/usr.bin/ofed/infiniband-diags/ibping/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/ibping/Makefile
head/usr.bin/ofed/infiniband-diags/ibportstate/
head/usr.bin/ofed/infiniband-diags/ibportstate/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/ibportstate/Makefile
head/usr.bin/ofed/infiniband-diags/ibqueryerrors/
head/usr.bin/ofed/infiniband-diags/ibqueryerrors/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/ibqueryerrors/Makefile
head/usr.bin/ofed/infiniband-diags/ibroute/
head/usr.bin/ofed/infiniband-diags/ibroute/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/ibroute/Makefile
head/usr.bin/ofed/infiniband-diags/ibstat/
head/usr.bin/ofed/infiniband-diags/ibstat/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/ibstat/Makefile
head/usr.bin/ofed/infiniband-diags/ibsysstat/
head/usr.bin/ofed/infiniband-diags/ibsysstat/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/ibsysstat/Makefile
head/usr.bin/ofed/infiniband-diags/ibtracert/
head/usr.bin/ofed/infiniband-diags/ibtracert/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/ibtracert/Makefile
head/usr.bin/ofed/infiniband-diags/perfquery/
head/usr.bin/ofed/infiniband-diags/perfquery/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/perfquery/Makefile
head/usr.bin/ofed/infiniband-diags/saquery/
head/usr.bin/ofed/infiniband-diags/saquery/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/saquery/Makefile
head/usr.bin/ofed/infiniband-diags/sminfo/
head/usr.bin/ofed/infiniband-diags/sminfo/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/sminfo/Makefile
head/usr.bin/ofed/infiniband-diags/smpdump/
head/usr.bin/ofed/infiniband-diags/smpdump/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/smpdump/Makefile
head/usr.bin/ofed/infiniband-diags/smpquery/
head/usr.bin/ofed/infiniband-diags/smpquery/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/smpquery/Makefile
head/usr.bin/ofed/infiniband-diags/vendstat/
head/usr.bin/ofed/infiniband-diags/vendstat/Makefile
- copied unchanged from r335252, head/contrib/ofed/infiniband-diags/build/vendstat/Makefile
head/usr.bin/ofed/libibverbs/
head/usr.bin/ofed/libibverbs/Makefile
- copied, changed from r335252, head/contrib/ofed/libibverbs/examples/build/Makefile
head/usr.bin/ofed/libibverbs/Makefile.inc (contents, props changed)
head/usr.bin/ofed/libibverbs/asyncwatch/
head/usr.bin/ofed/libibverbs/asyncwatch/Makefile
- copied, changed from r335252, head/contrib/ofed/libibverbs/examples/build/asyncwatch/Makefile
head/usr.bin/ofed/libibverbs/devices/
head/usr.bin/ofed/libibverbs/devices/Makefile
- copied, changed from r335252, head/contrib/ofed/libibverbs/examples/build/devices/Makefile
head/usr.bin/ofed/libibverbs/devinfo/
head/usr.bin/ofed/libibverbs/devinfo/Makefile
- copied, changed from r335252, head/contrib/ofed/libibverbs/examples/build/devinfo/Makefile
head/usr.bin/ofed/libibverbs/rc_pingpong/
head/usr.bin/ofed/libibverbs/rc_pingpong/Makefile
- copied, changed from r335252, head/contrib/ofed/libibverbs/examples/build/rc_pingpong/Makefile
head/usr.bin/ofed/libibverbs/srq_pingpong/
head/usr.bin/ofed/libibverbs/srq_pingpong/Makefile
- copied, changed from r335252, head/contrib/ofed/libibverbs/examples/build/srq_pingpong/Makefile
head/usr.bin/ofed/libibverbs/uc_pingpong/
head/usr.bin/ofed/libibverbs/uc_pingpong/Makefile
- copied, changed from r335252, head/contrib/ofed/libibverbs/examples/build/uc_pingpong/Makefile
head/usr.bin/ofed/libibverbs/ud_pingpong/
head/usr.bin/ofed/libibverbs/ud_pingpong/Makefile
- copied, changed from r335252, head/contrib/ofed/libibverbs/examples/build/ud_pingpong/Makefile
head/usr.bin/ofed/librdmacm/
head/usr.bin/ofed/librdmacm/Makefile
- copied unchanged from r335252, head/contrib/ofed/librdmacm/examples/build/Makefile
head/usr.bin/ofed/librdmacm/Makefile.inc (contents, props changed)
head/usr.bin/ofed/librdmacm/mckey/
head/usr.bin/ofed/librdmacm/mckey/Makefile
- copied, changed from r335252, head/contrib/ofed/librdmacm/examples/build/mckey/Makefile
head/usr.bin/ofed/librdmacm/rping/
head/usr.bin/ofed/librdmacm/rping/Makefile
- copied, changed from r335252, head/contrib/ofed/librdmacm/examples/build/rping/Makefile
head/usr.bin/ofed/librdmacm/ucmatose/
head/usr.bin/ofed/librdmacm/ucmatose/Makefile
- copied, changed from r335252, head/contrib/ofed/librdmacm/examples/build/ucmatose/Makefile
head/usr.bin/ofed/librdmacm/udaddy/
head/usr.bin/ofed/librdmacm/udaddy/Makefile
- copied, changed from r335252, head/contrib/ofed/librdmacm/examples/build/udaddy/Makefile
head/usr.bin/ofed/opensm/
head/usr.bin/ofed/opensm/Makefile
- copied, changed from r335252, head/contrib/ofed/opensm/opensm/Makefile
Deleted:
head/contrib/ofed/Makefile
head/contrib/ofed/include/Makefile
head/contrib/ofed/infiniband-diags/build/
head/contrib/ofed/libcxgb4/Makefile
head/contrib/ofed/libibcm/Makefile
head/contrib/ofed/libibmad/Makefile
head/contrib/ofed/libibnetdisc/Makefile
head/contrib/ofed/libibumad/Makefile
head/contrib/ofed/libibverbs/Makefile
head/contrib/ofed/libibverbs/examples/build/
head/contrib/ofed/libmlx4/Makefile
head/contrib/ofed/libmlx5/Makefile
head/contrib/ofed/librdmacm/Makefile
head/contrib/ofed/librdmacm/examples/build/
head/contrib/ofed/opensm/complib/Makefile
head/contrib/ofed/opensm/libopensm/
head/contrib/ofed/opensm/libvendor/Makefile
head/contrib/ofed/opensm/opensm/Makefile
head/contrib/ofed/usr.bin/
head/contrib/ofed/usr.lib/
Modified:
head/Makefile.inc1
head/lib/Makefile
head/share/mk/src.libnames.mk
head/usr.bin/Makefile
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Sat Jun 16 11:42:27 2018 (r335252)
+++ head/Makefile.inc1 Sat Jun 16 15:05:05 2018 (r335253)
@@ -274,9 +274,6 @@ SUBDIR+=sys usr.bin usr.sbin
.if ${MK_TESTS} != "no"
SUBDIR+= tests
.endif
-.if ${MK_OFED} != "no"
-SUBDIR+=contrib/ofed
-.endif
# Local directories are built in parallel with the base system directories.
# Users may insert a .WAIT directive at the beginning or elsewhere within
@@ -2462,24 +2459,16 @@ _lib_libradius= lib/libradius
.endif
.if ${MK_OFED} != "no"
-#
-# The OFED libraries are built in four steps
-# as reflected below, due to interdependencies.
-#
-# NOTE: Depending on contrib/ofed/include is only needed for
-# the lib32 compat build.
-#
-_ofed_lib= \
-contrib/ofed/include \
-contrib/ofed/usr.lib/0 \
-contrib/ofed/usr.lib/1 \
-contrib/ofed/usr.lib/2 \
-contrib/ofed/usr.lib/3
+_prebuild_libs+= \
+ lib/ofed/libibverbs \
+ lib/ofed/libibmad \
+ lib/ofed/libibumad \
+ lib/ofed/complib \
+ lib/ofed/libmlx5
-contrib/ofed/usr.lib/0__L: contrib/ofed/include__L lib/libthr__L
-contrib/ofed/usr.lib/1__L: contrib/ofed/usr.lib/0__L
-contrib/ofed/usr.lib/2__L: contrib/ofed/usr.lib/1__L
-contrib/ofed/usr.lib/3__L: contrib/ofed/usr.lib/2__L
+lib/ofed/libibmad__L: lib/ofed/libibumad__L
+lib/ofed/complib__L: lib/libthr__L
+lib/ofed/libmlx5__L: lib/ofed/libibverbs__L lib/libthr__L
.endif
.if ${MK_CASPER} != "no"
@@ -2490,7 +2479,7 @@ lib/libpjdlog__L: lib/libutil__L
lib/libcasper__L: lib/libnv__L
lib/liblzma__L: lib/libthr__L
-_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
+_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
.if ${MK_IPFILTER} != "no"
_generic_libs+= sbin/ipf/libipf
.endif
Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile Sat Jun 16 11:42:27 2018 (r335252)
+++ head/lib/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -67,7 +67,7 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \
libopie \
libpam \
libpathconv \
- ${_libpcap} \
+ libpcap \
libpjdlog \
${_libproc} \
libprocstat \
@@ -124,6 +124,9 @@ SUBDIR_DEPEND_libtacplus= libmd
SUBDIR_DEPEND_libulog= libmd
SUBDIR_DEPEND_libunbound= ${_libldns}
SUBDIR_DEPEND_liblzma= ${_libthr}
+.if ${MK_OFED} != "no"
+SUBDIR_DEPEND_libpcap= ofed
+.endif
# NB: keep these sorted by MK_* knobs
@@ -184,14 +187,6 @@ SUBDIR.${MK_PMC}+= libipt
SUBDIR.${MK_BHYVE}+= libvmmapi
.endif
-.if ${MK_OFED} == "no"
-#
-# When OFED is enabled libpcap is built as part of
-# OFED due to library dependencies
-#
-_libpcap= libpcap
-.endif
-
.if ${MACHINE_CPUARCH} != "sparc64"
_libproc= libproc
_librtld_db= librtld_db
@@ -212,6 +207,7 @@ SUBDIR.${MK_TESTS_SUPPORT}+= atf
SUBDIR.${MK_TESTS}+= tests
SUBDIR.${MK_UNBOUND}+= libunbound
SUBDIR.${MK_USB}+= libusbhid libusb
+SUBDIR.${MK_OFED}+= ofed
.if !make(install)
SUBDIR_PARALLEL=
Added: head/lib/ofed/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/ofed/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -0,0 +1,30 @@
+# $FreeBSD$
+
+SUBDIR= \
+ include \
+ libibverbs \
+ libibcm \
+ libibumad \
+ librdmacm \
+ libibmad \
+ complib \
+ libvendor \
+ libcxgb4 \
+ libmlx4 \
+ libmlx5 \
+ libibnetdisc \
+ libopensm
+
+SUBDIR_DEPEND_libibcm= libibverbs
+SUBDIR_DEPEND_librdmacm= libibverbs
+SUBDIR_DEPEND_libibmad= libibumad
+SUBDIR_DEPEND_libvendor= libibumad
+SUBDIR_DEPEND_libcxgb4= libibverbs
+SUBDIR_DEPEND_libmlx4= libibverbs
+SUBDIR_DEPEND_libmlx5= libibverbs
+SUBDIR_DEPEND_libibnetdisc= libibmad libibumad complib
+
+SUBDIR_PARALLEL=
+
+.include <bsd.subdir.mk>
+
Added: head/lib/ofed/Makefile.inc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/ofed/Makefile.inc Sat Jun 16 15:05:05 2018 (r335253)
@@ -0,0 +1 @@
+# $FreeBSD$
Copied and modified: head/lib/ofed/complib/Makefile (from r335252, head/contrib/ofed/opensm/complib/Makefile)
==============================================================================
--- head/contrib/ofed/opensm/complib/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/lib/ofed/complib/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}
+_spath= ${SRCTOP}/contrib/ofed/opensm/complib
+.PATH: ${_spath}
SHLIBDIR?= /usr/lib
LIB= osmcomp
@@ -26,9 +27,9 @@ cl_timer.c \
cl_vector.c \
ib_statustext.c
-CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1
+CFLAGS+= -I${_spath}/.. -DHAVE_CONFIG_H=1
CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
LIBADD= pthread
-VERSION_MAP= ${.CURDIR}/libosmcomp.map
+VERSION_MAP= ${_spath}/libosmcomp.map
.include <bsd.lib.mk>
Copied and modified: head/lib/ofed/include/Makefile (from r335252, head/contrib/ofed/include/Makefile)
==============================================================================
--- head/contrib/ofed/include/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/lib/ofed/include/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,20 +1,21 @@
# $FreeBSD$
-IBVERBS= ${.CURDIR}/../libibverbs
-IBMAD= ${.CURDIR}/../libibmad
-IBUMAD= ${.CURDIR}/../libibumad
-IBCM= ${.CURDIR}/../libibcm
-IBND= ${.CURDIR}/../libibnetdisc
-RDMACM= ${.CURDIR}/../librdmacm
-RDMA= ${.CURDIR}/../../../sys/ofed/include/uapi/rdma
-OSM= ${.CURDIR}/../opensm/include
+OFEDINCS= ${SRCTOP}/contrib/ofed/include
+IBVERBS= ${SRCTOP}/contrib/ofed/libibverbs
+IBMAD= ${SRCTOP}/contrib/ofed/libibmad
+IBUMAD= ${SRCTOP}/contrib/ofed/libibumad
+IBCM= ${SRCTOP}/contrib/ofed/libibcm
+IBND= ${SRCTOP}/contrib/ofed/libibnetdisc
+RDMACM= ${SRCTOP}/contrib/ofed/librdmacm
+RDMA= ${SRCTOP}/sys/ofed/include/uapi/rdma
+OSM= ${SRCTOP}/contrib/ofed/opensm/include
IBINCS= \
-byteorder.h \
-byteswap.h \
-endian.h \
-types.h \
-udma_barrier.h \
+${OFEDINCS}/byteorder.h \
+${OFEDINCS}/byteswap.h \
+${OFEDINCS}/endian.h \
+${OFEDINCS}/types.h \
+${OFEDINCS}/udma_barrier.h \
${IBVERBS}/arch.h \
${IBVERBS}/driver.h \
${IBVERBS}/kern-abi.h \
Copied and modified: head/lib/ofed/libcxgb4/Makefile (from r335252, head/contrib/ofed/libcxgb4/Makefile)
==============================================================================
--- head/contrib/ofed/libcxgb4/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/lib/ofed/libcxgb4/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}
+_spath= ${SRCTOP}/contrib/ofed/libcxgb4
+.PATH: ${_spath}
SHLIBDIR?= /usr/lib
LIB= cxgb4
@@ -14,6 +15,6 @@ qp.c \
verbs.c
LIBADD= ibverbs pthread
-CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${_spath}
.include <bsd.lib.mk>
Copied and modified: head/lib/ofed/libibcm/Makefile (from r335252, head/contrib/ofed/libibcm/Makefile)
==============================================================================
--- head/contrib/ofed/libibcm/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/lib/ofed/libibcm/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}
+_spath= ${SRCTOP}/contrib/ofed/libibcm
+.PATH: ${_spath}
SHLIBDIR?= /usr/lib
LIB= ibcm
@@ -8,8 +9,8 @@ SHLIB_MAJOR= 1
MK_PROFILE= no
SRCS= cm.c
LIBADD= ibverbs
-CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${_spath}
MAN=
-VERSION_MAP= ${.CURDIR}/libibcm.map
+VERSION_MAP= ${_spath}/libibcm.map
.include <bsd.lib.mk>
Copied and modified: head/lib/ofed/libibmad/Makefile (from r335252, head/contrib/ofed/libibmad/Makefile)
==============================================================================
--- head/contrib/ofed/libibmad/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/lib/ofed/libibmad/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}
+_spath= ${SRCTOP}/contrib/ofed/libibmad
+.PATH: ${_spath}
SHLIBDIR?= /usr/lib
LIB= ibmad
@@ -25,8 +26,8 @@ vendor.c
LIBADD= ibumad
CFLAGS+= -DHAVE_CONFIG_H=1
-CFLAGS+= -I${.CURDIR}
-VERSION_MAP= ${.CURDIR}/libibmad.map
+CFLAGS+= -I${_spath}
+VERSION_MAP= ${_spath}/libibmad.map
.include <bsd.lib.mk>
Copied and modified: head/lib/ofed/libibnetdisc/Makefile (from r335252, head/contrib/ofed/libibnetdisc/Makefile)
==============================================================================
--- head/contrib/ofed/libibnetdisc/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/lib/ofed/libibnetdisc/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -2,7 +2,8 @@
.include <src.opts.mk>
-.PATH: ${.CURDIR} ${.CURDIR}/man
+_spath= ${SRCTOP}/contrib/ofed/libibnetdisc
+.PATH: ${_spath} ${_spath}/man
SHLIBDIR?= /usr/lib
LIB_CXX= ibnetdisc
@@ -28,11 +29,11 @@ ibnd_show_progress.3
LIBADD= osmcomp ibmad ibumad
CFLAGS+= -DHAVE_CONFIG_H=1
-CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${_spath}
CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
.if ${COMPILER_FEATURES:Mc++11}
CXXFLAGS+= -std=c++11
.endif
-VERSION_MAP= ${.CURDIR}/libibnetdisc.map
+VERSION_MAP= ${_spath}/libibnetdisc.map
.include <bsd.lib.mk>
Copied and modified: head/lib/ofed/libibumad/Makefile (from r335252, head/contrib/ofed/libibumad/Makefile)
==============================================================================
--- head/contrib/ofed/libibumad/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/lib/ofed/libibumad/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}
+_spath= ${SRCTOP}/contrib/ofed/libibumad
+.PATH: ${_spath}
SHLIBDIR?= /usr/lib
LIB= ibumad
@@ -10,7 +11,7 @@ SRCS= \
umad.c \
umad_str.c \
sysfs.c
-CFLAGS+= -I${.CURDIR}
-VERSION_MAP= ${.CURDIR}/libibumad.map
+CFLAGS+= -I${_spath}
+VERSION_MAP= ${_spath}/libibumad.map
.include <bsd.lib.mk>
Copied and modified: head/lib/ofed/libibverbs/Makefile (from r335252, head/contrib/ofed/libibverbs/Makefile)
==============================================================================
--- head/contrib/ofed/libibverbs/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/lib/ofed/libibverbs/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,14 +1,15 @@
# $FreeBSD$
-.PATH: ${.CURDIR} ${.CURDIR}/man
+_spath= ${SRCTOP}/contrib/ofed/libibverbs
+.PATH: ${_spath} ${_spath}/man
LIB= ibverbs
SHLIB_MAJOR= 1
SHLIBDIR?= /usr/lib
MK_PROFILE= no
-VERSION_MAP= ${.CURDIR}/libibverbs.map
+VERSION_MAP= ${_spath}/libibverbs.map
-CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${_spath}
SRCS= \
cmd.c \
Copied and modified: head/lib/ofed/libmlx4/Makefile (from r335252, head/contrib/ofed/libmlx4/Makefile)
==============================================================================
--- head/contrib/ofed/libmlx4/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/lib/ofed/libmlx4/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}
+_spath= ${SRCTOP}/contrib/ofed/libmlx4
+.PATH: ${_spath}
SHLIBDIR?= /usr/lib
LIB= mlx4
@@ -17,6 +18,6 @@ srq.c \
verbs.c
LIBADD= ibverbs pthread
-CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${_spath}
.include <bsd.lib.mk>
Copied and modified: head/lib/ofed/libmlx5/Makefile (from r335252, head/contrib/ofed/libmlx5/Makefile)
==============================================================================
--- head/contrib/ofed/libmlx5/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/lib/ofed/libmlx5/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}
+_spath= ${SRCTOP}/contrib/ofed/libmlx5
+.PATH: ${_spath}
SHLIBDIR?= /usr/lib
LIB= mlx5
@@ -17,8 +18,8 @@ srq.c \
verbs.c
LIBADD= ibverbs pthread
-CFLAGS+= -I${.CURDIR}
-VERSION_MAP= ${.CURDIR}/libmlx5.map
+CFLAGS+= -I${_spath}
+VERSION_MAP= ${_spath}/libmlx5.map
.include <bsd.lib.mk>
Copied and modified: head/lib/ofed/libopensm/Makefile (from r335252, head/contrib/ofed/opensm/libopensm/Makefile)
==============================================================================
--- head/contrib/ofed/opensm/libopensm/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/lib/ofed/libopensm/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../opensm
+_spath= ${SRCTOP}/contrib/ofed/opensm/opensm
+.PATH: ${_spath}
SHLIBDIR?= /usr/lib
LIB= opensm
@@ -13,8 +14,8 @@ osm_mad_pool.c \
osm_helper.c
LIBADD= pthread
-CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1
+CFLAGS+= -I${_spath} -I${_spath}/.. -DHAVE_CONFIG_H=1
CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
-VERSION_MAP= ${.CURDIR}/../opensm/libopensm.map
+VERSION_MAP= ${_spath}/libopensm.map
.include <bsd.lib.mk>
Copied and modified: head/lib/ofed/librdmacm/Makefile (from r335252, head/contrib/ofed/librdmacm/Makefile)
==============================================================================
--- head/contrib/ofed/librdmacm/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/lib/ofed/librdmacm/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,12 +1,13 @@
# $FreeBSD$
-.PATH: ${.CURDIR} ${.CURDIR}/man
+_spath= ${SRCTOP}/contrib/ofed/librdmacm
+.PATH: ${_spath} ${_spath}/man
SHLIBDIR?= /usr/lib
LIB= rdmacm
SHLIB_MAJOR= 1
MK_PROFILE= no
-CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${_spath}
SRCS= \
acm.c \
@@ -66,6 +67,6 @@ rdma_resolve_route.3 \
rdma_set_option.3
LIBADD= ibverbs
-VERSION_MAP= ${.CURDIR}/librdmacm.map
+VERSION_MAP= ${_spath}/librdmacm.map
.include <bsd.lib.mk>
Copied and modified: head/lib/ofed/libvendor/Makefile (from r335252, head/contrib/ofed/opensm/libvendor/Makefile)
==============================================================================
--- head/contrib/ofed/opensm/libvendor/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/lib/ofed/libvendor/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}
+_spath= ${SRCTOP}/contrib/ofed/opensm/libvendor
+.PATH: ${_spath}
SHLIBDIR?= /usr/lib
LIB= osmvendor
@@ -12,8 +13,8 @@ osm_vendor_ibumad.c \
osm_vendor_ibumad_sa.c
LIBADD= ibumad pthread
-CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1
+CFLAGS+= -I${_spath}/.. -DHAVE_CONFIG_H=1
CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
-VERSION_MAP= ${.CURDIR}/libosmvendor.map
+VERSION_MAP= ${_spath}/libosmvendor.map
.include <bsd.lib.mk>
Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk Sat Jun 16 11:42:27 2018 (r335252)
+++ head/share/mk/src.libnames.mk Sat Jun 16 15:05:05 2018 (r335253)
@@ -492,18 +492,18 @@ LIBZFS_COREDIR= ${OBJTOP}/cddl/lib/libzfs_core
LIBZPOOLDIR= ${OBJTOP}/cddl/lib/libzpool
# 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
+LIBCXGB4DIR= ${OBJTOP}/lib/ofed/libcxgb4
+LIBIBCMDIR= ${OBJTOP}/lib/ofed/libibcm
+LIBIBMADDIR= ${OBJTOP}/lib/ofed/libibmad
+LIBIBNETDISCDIR=${OBJTOP}/lib/ofed/libibnetdisc
+LIBIBUMADDIR= ${OBJTOP}/lib/ofed/libibumad
+LIBIBVERBSDIR= ${OBJTOP}/lib/ofed/libibverbs
+LIBMLX4DIR= ${OBJTOP}/lib/ofed/libmlx4
+LIBMLX5DIR= ${OBJTOP}/lib/ofed/libmlx5
+LIBRDMACMDIR= ${OBJTOP}/lib/ofed/librdmacm
+LIBOSMCOMPDIR= ${OBJTOP}/lib/ofed/complib
+LIBOPENSMDIR= ${OBJTOP}/lib/ofed/libopensm
+LIBOSMVENDORDIR=${OBJTOP}/lib/ofed/libvendor
LIBDIALOGDIR= ${OBJTOP}/gnu/lib/libdialog
LIBGCOVDIR= ${OBJTOP}/gnu/lib/libgcov
Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile Sat Jun 16 11:42:27 2018 (r335252)
+++ head/usr.bin/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -292,6 +292,7 @@ SUBDIR.${MK_UTMPX}+= users
SUBDIR.${MK_UTMPX}+= who
SUBDIR.${MK_SVN}+= svn
SUBDIR.${MK_SVNLITE}+= svn
+SUBDIR.${MK_OFED}+= ofed
# These are normally only handled for build-tools.
.if make(clean*)
Added: head/usr.bin/ofed/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+SUBDIR= \
+ libibverbs \
+ librdmacm \
+ opensm \
+ infiniband-diags
+
+SUBDIR_PARALLEL=
+
+.include <bsd.subdir.mk>
Copied: head/usr.bin/ofed/infiniband-diags/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/Makefile)
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+SUBDIR= \
+dump_fts \
+ibaddr \
+ibcacheedit \
+ibccconfig \
+ibccquery \
+iblinkinfo \
+ibmirror \
+ibnetdiscover \
+ibping \
+ibportstate \
+ibqueryerrors \
+ibroute \
+ibstat \
+ibsysstat \
+ibtracert \
+perfquery \
+saquery \
+sminfo \
+smpdump \
+smpquery \
+vendstat
+
+SUBDIR_PARALLEL=
+
+.include <bsd.subdir.mk>
+
Copied and modified: head/usr.bin/ofed/infiniband-diags/Makefile.inc (from r335252, head/contrib/ofed/infiniband-diags/build/Makefile.inc)
==============================================================================
--- head/contrib/ofed/infiniband-diags/build/Makefile.inc Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/usr.bin/ofed/infiniband-diags/Makefile.inc Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../src ${.CURDIR}/../../man
+_spath= ${SRCTOP}/contrib/ofed/infiniband-diags
+.PATH: ${_spath}/src ${_spath}/man
BINDIR?= /usr/bin
SRCS+= ibdiag_common.c ibdiag_sa.c
CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
CFLAGS+= -DHAVE_CONFIG_H=1
-CFLAGS+= -I${.CURDIR}/../../
-CFLAGS+= -I${.CURDIR}/../../src
+CFLAGS+= -I${_spath} -I${_spath}/src
LIBADD+= osmcomp ibmad ibumad
Copied: head/usr.bin/ofed/infiniband-diags/dump_fts/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/dump_fts/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/dump_fts/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/dump_fts/Makefile)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+PROG= dump_fts
+SRCS= dump_fts.c
+LIBADD= ibnetdisc
+MAN= dump_fts.8
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/ibaddr/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/ibaddr/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/ibaddr/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/ibaddr/Makefile)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibaddr
+SRCS= ibaddr.c
+MAN= ibaddr.8
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/ibcacheedit/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/ibcacheedit/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/ibcacheedit/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/ibcacheedit/Makefile)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+PROG= ibcacheedit
+SRCS= ibcacheedit.c
+LIBADD= ibnetdisc
+MAN= ibcacheedit.8
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/ibccconfig/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/ibccconfig/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/ibccconfig/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/ibccconfig/Makefile)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibccconfig
+SRCS= ibccconfig.c
+MAN= ibccconfig.8
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/ibccquery/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/ibccquery/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/ibccquery/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/ibccquery/Makefile)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibccquery
+SRCS= ibccquery.c
+MAN= ibccquery.8
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/iblinkinfo/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/iblinkinfo/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/iblinkinfo/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/iblinkinfo/Makefile)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+PROG= iblinkinfo
+SRCS= iblinkinfo.c
+LIBADD= ibnetdisc
+MAN= iblinkinfo.8
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/ibmirror/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/ibmirror/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/ibmirror/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/ibmirror/Makefile)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibmirror
+SRCS= ibmirror.c
+MAN=
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/ibnetdiscover/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/ibnetdiscover/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/ibnetdiscover/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/ibnetdiscover/Makefile)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+PROG= ibnetdiscover
+SRCS= ibnetdiscover.c
+LIBADD= ibnetdisc
+MAN= ibnetdiscover.8
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/ibping/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/ibping/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/ibping/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/ibping/Makefile)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibping
+SRCS= ibping.c
+MAN= ibping.8
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/ibportstate/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/ibportstate/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/ibportstate/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/ibportstate/Makefile)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibportstate
+SRCS= ibportstate.c
+MAN= ibportstate.8
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/ibqueryerrors/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/ibqueryerrors/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/ibqueryerrors/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/ibqueryerrors/Makefile)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+PROG= ibqueryerrors
+SRCS= ibqueryerrors.c
+LIBADD= ibnetdisc
+MAN= ibqueryerrors.8
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/ibroute/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/ibroute/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/ibroute/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/ibroute/Makefile)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibroute
+SRCS= ibroute.c
+MAN= ibroute.8
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/ibstat/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/ibstat/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/ibstat/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/ibstat/Makefile)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibstat
+SRCS= ibstat.c
+MAN= ibstat.8
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/ibsysstat/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/ibsysstat/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/ibsysstat/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/ibsysstat/Makefile)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibsysstat
+SRCS= ibsysstat.c
+MAN= ibsysstat.8
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/ibtracert/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/ibtracert/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/ibtracert/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/ibtracert/Makefile)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibtracert
+SRCS= ibtracert.c
+MAN= ibtracert.8
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/perfquery/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/perfquery/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/perfquery/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/perfquery/Makefile)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= perfquery
+SRCS= perfquery.c
+MAN= perfquery.8
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/saquery/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/saquery/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/saquery/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/saquery/Makefile)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= saquery
+SRCS= saquery.c
+MAN= saquery.8
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/sminfo/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/sminfo/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/sminfo/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/sminfo/Makefile)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= sminfo
+SRCS= sminfo.c
+MAN= sminfo.8
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/smpdump/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/smpdump/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/smpdump/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/smpdump/Makefile)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= smpdump
+SRCS= smpdump.c
+MAN= smpdump.8
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/smpquery/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/smpquery/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/smpquery/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/smpquery/Makefile)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= smpquery
+SRCS= smpquery.c
+MAN= smpquery.8
+
+.include <bsd.prog.mk>
Copied: head/usr.bin/ofed/infiniband-diags/vendstat/Makefile (from r335252, head/contrib/ofed/infiniband-diags/build/vendstat/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/infiniband-diags/vendstat/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/infiniband-diags/build/vendstat/Makefile)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= vendstat
+SRCS= vendstat.c
+MAN= vendstat.8
+
+.include <bsd.prog.mk>
Copied and modified: head/usr.bin/ofed/libibverbs/Makefile (from r335252, head/contrib/ofed/libibverbs/examples/build/Makefile)
==============================================================================
--- head/contrib/ofed/libibverbs/examples/build/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/usr.bin/ofed/libibverbs/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,3 +1,5 @@
+# $FreeBSD$
+
SUBDIR= \
asyncwatch \
devinfo \
Added: head/usr.bin/ofed/libibverbs/Makefile.inc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/libibverbs/Makefile.inc Sat Jun 16 15:05:05 2018 (r335253)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+_spath=${SRCTOP}/contrib/ofed/libibverbs
+.PATH: ${_spath}/examples ${_spath}/man
+
+BINDIR?= /usr/bin
+CFLAGS+= -I${_spath}
+LIBADD+= ibverbs mlx4 mlx5 cxgb4 pthread
+
Copied and modified: head/usr.bin/ofed/libibverbs/asyncwatch/Makefile (from r335252, head/contrib/ofed/libibverbs/examples/build/asyncwatch/Makefile)
==============================================================================
--- head/contrib/ofed/libibverbs/examples/build/asyncwatch/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/usr.bin/ofed/libibverbs/asyncwatch/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,5 +1,4 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
PROG= ibv_asyncwatch
MAN= ibv_asyncwatch.1
Copied and modified: head/usr.bin/ofed/libibverbs/devices/Makefile (from r335252, head/contrib/ofed/libibverbs/examples/build/devices/Makefile)
==============================================================================
--- head/contrib/ofed/libibverbs/examples/build/devices/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/usr.bin/ofed/libibverbs/devices/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,5 +1,4 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
PROG= ibv_devices
MAN= ibv_devices.1
Copied and modified: head/usr.bin/ofed/libibverbs/devinfo/Makefile (from r335252, head/contrib/ofed/libibverbs/examples/build/devinfo/Makefile)
==============================================================================
--- head/contrib/ofed/libibverbs/examples/build/devinfo/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/usr.bin/ofed/libibverbs/devinfo/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,5 +1,4 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
PROG= ibv_devinfo
MAN= ibv_devinfo.1
Copied and modified: head/usr.bin/ofed/libibverbs/rc_pingpong/Makefile (from r335252, head/contrib/ofed/libibverbs/examples/build/rc_pingpong/Makefile)
==============================================================================
--- head/contrib/ofed/libibverbs/examples/build/rc_pingpong/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/usr.bin/ofed/libibverbs/rc_pingpong/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,5 +1,4 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
PROG= ibv_rc_pingpong
MAN= ibv_rc_pingpong.1
Copied and modified: head/usr.bin/ofed/libibverbs/srq_pingpong/Makefile (from r335252, head/contrib/ofed/libibverbs/examples/build/srq_pingpong/Makefile)
==============================================================================
--- head/contrib/ofed/libibverbs/examples/build/srq_pingpong/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/usr.bin/ofed/libibverbs/srq_pingpong/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,5 +1,4 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
PROG= ibv_srq_pingpong
MAN= ibv_srq_pingpong.1
Copied and modified: head/usr.bin/ofed/libibverbs/uc_pingpong/Makefile (from r335252, head/contrib/ofed/libibverbs/examples/build/uc_pingpong/Makefile)
==============================================================================
--- head/contrib/ofed/libibverbs/examples/build/uc_pingpong/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/usr.bin/ofed/libibverbs/uc_pingpong/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,5 +1,4 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
PROG= ibv_uc_pingpong
MAN= ibv_uc_pingpong.1
Copied and modified: head/usr.bin/ofed/libibverbs/ud_pingpong/Makefile (from r335252, head/contrib/ofed/libibverbs/examples/build/ud_pingpong/Makefile)
==============================================================================
--- head/contrib/ofed/libibverbs/examples/build/ud_pingpong/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/usr.bin/ofed/libibverbs/ud_pingpong/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,5 +1,4 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
PROG= ibv_ud_pingpong
MAN= ibv_ud_pingpong.1
Copied: head/usr.bin/ofed/librdmacm/Makefile (from r335252, head/contrib/ofed/librdmacm/examples/build/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/librdmacm/Makefile Sat Jun 16 15:05:05 2018 (r335253, copy of r335252, head/contrib/ofed/librdmacm/examples/build/Makefile)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+SUBDIR= ucmatose mckey rping udaddy
+
+SUBDIR_PARALLEL=
+
+.include <bsd.subdir.mk>
Added: head/usr.bin/ofed/librdmacm/Makefile.inc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/ofed/librdmacm/Makefile.inc Sat Jun 16 15:05:05 2018 (r335253)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+_spath=${SRCTOP}/contrib/ofed/librdmacm
+.PATH: ${_spath}/examples ${_spath}/man
+
+BINDIR?= /usr/bin
+CFLAGS+= -I${SRCTOP}/contrib/ofed
+LIBADD+= ibverbs rdmacm mlx4 mlx5 cxgb4 pthread
Copied and modified: head/usr.bin/ofed/librdmacm/mckey/Makefile (from r335252, head/contrib/ofed/librdmacm/examples/build/mckey/Makefile)
==============================================================================
--- head/contrib/ofed/librdmacm/examples/build/mckey/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/usr.bin/ofed/librdmacm/mckey/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,7 +1,5 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
-
PROG= mckey
MAN= mckey.1
SRCS= mckey.c
Copied and modified: head/usr.bin/ofed/librdmacm/rping/Makefile (from r335252, head/contrib/ofed/librdmacm/examples/build/rping/Makefile)
==============================================================================
--- head/contrib/ofed/librdmacm/examples/build/rping/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/usr.bin/ofed/librdmacm/rping/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,7 +1,5 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
-
PROG= rping
MAN= rping.1
SRCS= rping.c common.c
Copied and modified: head/usr.bin/ofed/librdmacm/ucmatose/Makefile (from r335252, head/contrib/ofed/librdmacm/examples/build/ucmatose/Makefile)
==============================================================================
--- head/contrib/ofed/librdmacm/examples/build/ucmatose/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/usr.bin/ofed/librdmacm/ucmatose/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,7 +1,5 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
-
PROG= ucmatose
MAN= ucmatose.1
SRCS= cmatose.c common.c
Copied and modified: head/usr.bin/ofed/librdmacm/udaddy/Makefile (from r335252, head/contrib/ofed/librdmacm/examples/build/udaddy/Makefile)
==============================================================================
--- head/contrib/ofed/librdmacm/examples/build/udaddy/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/usr.bin/ofed/librdmacm/udaddy/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,7 +1,5 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
-
PROG= udaddy
MAN= udaddy.1
SRCS= udaddy.c common.c
Copied and modified: head/usr.bin/ofed/opensm/Makefile (from r335252, head/contrib/ofed/opensm/opensm/Makefile)
==============================================================================
--- head/contrib/ofed/opensm/opensm/Makefile Sat Jun 16 11:42:27 2018 (r335252, copy source)
+++ head/usr.bin/ofed/opensm/Makefile Sat Jun 16 15:05:05 2018 (r335253)
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR} ${.CURDIR}/../man
+_spath= ${SRCTOP}/contrib/ofed/opensm/opensm
+.PATH: ${_spath} ${_spath:H}/man
BINDIR?= /usr/bin
PROG= opensm
@@ -94,7 +95,7 @@ osm_vl_arb_rcv.c \
st.c
MAN= opensm.8
-CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1
+CFLAGS+= -I${_spath:H} -DHAVE_CONFIG_H=1
CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
LIBADD= opensm osmvendor osmcomp wrap pthread
More information about the svn-src-head
mailing list