diff options
| author | Hans Petter Selasky <hselasky@FreeBSD.org> | 2014-11-30 13:27:58 +0000 |
|---|---|---|
| committer | Hans Petter Selasky <hselasky@FreeBSD.org> | 2014-11-30 13:27:58 +0000 |
| commit | 78328f86e2b2341271b697e3f0604d4836499910 (patch) | |
| tree | 97f6d2535315bf16bbd5d3cb55556a27c4bf15c3 /contrib/ofed | |
| parent | 651e4e6a307776b3f5201639e10c4b4d0949dcb0 (diff) | |
| download | src-78328f86e2b2341271b697e3f0604d4836499910.tar.gz src-78328f86e2b2341271b697e3f0604d4836499910.zip | |
Fix building of some infiniband utilities by updating some header file
locations and compiler include directives.
MFC after: 3 days
Sponsored by: Mellanox Technologies
Notes
Notes:
svn path=/head/; revision=275330
Diffstat (limited to 'contrib/ofed')
7 files changed, 16 insertions, 11 deletions
diff --git a/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c b/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c index 2cfaa8ae55ef..5e092f7b0877 100644 --- a/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c +++ b/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c @@ -50,7 +50,7 @@ #include <infiniband/common.h> #include <infiniband/umad.h> #include <infiniband/mad.h> -#include <infiniband/complib/cl_nodenamemap.h> +#include <complib/cl_nodenamemap.h> #include "ibnetdiscover.h" #include "grouping.h" diff --git a/contrib/ofed/management/infiniband-diags/src/ibroute.c b/contrib/ofed/management/infiniband-diags/src/ibroute.c index f2ee170cedc0..9607aa9999a5 100644 --- a/contrib/ofed/management/infiniband-diags/src/ibroute.c +++ b/contrib/ofed/management/infiniband-diags/src/ibroute.c @@ -49,7 +49,7 @@ #include <infiniband/common.h> #include <infiniband/umad.h> #include <infiniband/mad.h> -#include <infiniband/complib/cl_nodenamemap.h> +#include <complib/cl_nodenamemap.h> #include "ibdiag_common.h" diff --git a/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c b/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c index 66620de62e2b..2754dc008dea 100644 --- a/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c +++ b/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c @@ -43,7 +43,7 @@ #include <getopt.h> #include <infiniband/mad.h> -#include <infiniband/iba/ib_types.h> +#include <iba/ib_types.h> #include "ibdiag_common.h" diff --git a/contrib/ofed/management/infiniband-diags/src/ibtracert.c b/contrib/ofed/management/infiniband-diags/src/ibtracert.c index bde0ea795326..f8ecf76483cc 100644 --- a/contrib/ofed/management/infiniband-diags/src/ibtracert.c +++ b/contrib/ofed/management/infiniband-diags/src/ibtracert.c @@ -49,7 +49,7 @@ #include <infiniband/common.h> #include <infiniband/umad.h> #include <infiniband/mad.h> -#include <infiniband/complib/cl_nodenamemap.h> +#include <complib/cl_nodenamemap.h> #include "ibdiag_common.h" diff --git a/contrib/ofed/management/infiniband-diags/src/saquery.c b/contrib/ofed/management/infiniband-diags/src/saquery.c index 97663d1d538f..9f882e73a401 100644 --- a/contrib/ofed/management/infiniband-diags/src/saquery.c +++ b/contrib/ofed/management/infiniband-diags/src/saquery.c @@ -50,12 +50,12 @@ #include <getopt.h> #include <infiniband/mad.h> -#include <infiniband/opensm/osm_log.h> -#include <infiniband/vendor/osm_vendor_api.h> -#include <infiniband/vendor/osm_vendor_sa_api.h> -#include <infiniband/opensm/osm_mad_pool.h> -#include <infiniband/complib/cl_debug.h> -#include <infiniband/complib/cl_nodenamemap.h> +#include <opensm/osm_log.h> +#include <vendor/osm_vendor_api.h> +#include <vendor/osm_vendor_sa_api.h> +#include <opensm/osm_mad_pool.h> +#include <complib/cl_debug.h> +#include <complib/cl_nodenamemap.h> #include <netinet/in.h> diff --git a/contrib/ofed/management/infiniband-diags/src/smpquery.c b/contrib/ofed/management/infiniband-diags/src/smpquery.c index ed8ec83c9a06..01ccfaf16412 100644 --- a/contrib/ofed/management/infiniband-diags/src/smpquery.c +++ b/contrib/ofed/management/infiniband-diags/src/smpquery.c @@ -50,7 +50,7 @@ #include <infiniband/common.h> #include <infiniband/umad.h> #include <infiniband/mad.h> -#include <infiniband/complib/cl_nodenamemap.h> +#include <complib/cl_nodenamemap.h> #include "ibdiag_common.h" diff --git a/contrib/ofed/usr.bin/Makefile.inc b/contrib/ofed/usr.bin/Makefile.inc index e6a0550b82d3..d05778c68d37 100644 --- a/contrib/ofed/usr.bin/Makefile.inc +++ b/contrib/ofed/usr.bin/Makefile.inc @@ -1,4 +1,9 @@ DIAGPATH= ${.CURDIR}/../../management/infiniband-diags BINDIR?= /usr/bin CFLAGS+= -I${.CURDIR}/../../include/infiniband +CFLAGS+= -I${.CURDIR}/../../include CFLAGS+= -I${.CURDIR}/../../management/opensm/include/ +CFLAGS+= -I${.CURDIR}/../../management/opensm +CFLAGS+= -I${.CURDIR}/../../management/libibcommon/include +CFLAGS+= -I${.CURDIR}/../../management/libibumad/include +CFLAGS+= -I${.CURDIR}/../../management/libibmad/include |