svn commit: r275330 - in head/contrib/ofed: management/infiniband-diags/src usr.bin

[Hans Petter Selasky]

Author: hselasky
Date: Sun Nov 30 13:27:58 2014
New Revision: 275330
URL: https://svnweb.freebsd.org/changeset/base/275330

Log:
  Fix building of some infiniband utilities by updating some header file
  locations and compiler include directives.
  
  MFC after:	3 days
  Sponsored by:	Mellanox Technologies

Modified:
  head/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c
  head/contrib/ofed/management/infiniband-diags/src/ibroute.c
  head/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c
  head/contrib/ofed/management/infiniband-diags/src/ibtracert.c
  head/contrib/ofed/management/infiniband-diags/src/saquery.c
  head/contrib/ofed/management/infiniband-diags/src/smpquery.c
  head/contrib/ofed/usr.bin/Makefile.inc

Modified: head/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c
==============================================================================
--- head/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c	Sun Nov 30 13:24:21 2014	(r275329)
+++ head/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c	Sun Nov 30 13:27:58 2014	(r275330)
@@ -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"

Modified: head/contrib/ofed/management/infiniband-diags/src/ibroute.c
==============================================================================
--- head/contrib/ofed/management/infiniband-diags/src/ibroute.c	Sun Nov 30 13:24:21 2014	(r275329)
+++ head/contrib/ofed/management/infiniband-diags/src/ibroute.c	Sun Nov 30 13:27:58 2014	(r275330)
@@ -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"
 

Modified: head/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c
==============================================================================
--- head/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c	Sun Nov 30 13:24:21 2014	(r275329)
+++ head/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c	Sun Nov 30 13:27:58 2014	(r275330)
@@ -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"
 

Modified: head/contrib/ofed/management/infiniband-diags/src/ibtracert.c
==============================================================================
--- head/contrib/ofed/management/infiniband-diags/src/ibtracert.c	Sun Nov 30 13:24:21 2014	(r275329)
+++ head/contrib/ofed/management/infiniband-diags/src/ibtracert.c	Sun Nov 30 13:27:58 2014	(r275330)
@@ -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"
 

Modified: head/contrib/ofed/management/infiniband-diags/src/saquery.c
==============================================================================
--- head/contrib/ofed/management/infiniband-diags/src/saquery.c	Sun Nov 30 13:24:21 2014	(r275329)
+++ head/contrib/ofed/management/infiniband-diags/src/saquery.c	Sun Nov 30 13:27:58 2014	(r275330)
@@ -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>
 

Modified: head/contrib/ofed/management/infiniband-diags/src/smpquery.c
==============================================================================
--- head/contrib/ofed/management/infiniband-diags/src/smpquery.c	Sun Nov 30 13:24:21 2014	(r275329)
+++ head/contrib/ofed/management/infiniband-diags/src/smpquery.c	Sun Nov 30 13:27:58 2014	(r275330)
@@ -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"
 

Modified: head/contrib/ofed/usr.bin/Makefile.inc
==============================================================================
--- head/contrib/ofed/usr.bin/Makefile.inc	Sun Nov 30 13:24:21 2014	(r275329)
+++ head/contrib/ofed/usr.bin/Makefile.inc	Sun Nov 30 13:27:58 2014	(r275330)
@@ -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