Author: hselasky
Date: Wed Dec 3 09:10:41 2014
New Revision: 275449
URL: https://svnweb.freebsd.org/changeset/base/275449
Log:
MFC r275328 and r275330:
Add missing libraries when linking and fix building of some infiniband
utilities by updating some header file locations and compiler include
directives.
Sponsored by: Mellanox Technologies
Modified:
stable/9/contrib/ofed/librdmacm/examples/build/cmatose/Makefile
stable/9/contrib/ofed/librdmacm/examples/build/mckey/Makefile
stable/9/contrib/ofed/librdmacm/examples/build/rping/Makefile
stable/9/contrib/ofed/librdmacm/examples/build/udaddy/Makefile
stable/9/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c
stable/9/contrib/ofed/management/infiniband-diags/src/ibroute.c
stable/9/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c
stable/9/contrib/ofed/management/infiniband-diags/src/ibtracert.c
stable/9/contrib/ofed/management/infiniband-diags/src/saquery.c
stable/9/contrib/ofed/management/infiniband-diags/src/smpquery.c
stable/9/contrib/ofed/usr.bin/Makefile.inc
Directory Properties:
stable/9/contrib/ (props changed)
Modified: stable/9/contrib/ofed/librdmacm/examples/build/cmatose/Makefile
==============================================================================
--- stable/9/contrib/ofed/librdmacm/examples/build/cmatose/Makefile Wed Dec
3 09:08:04 2014 (r275448)
+++ stable/9/contrib/ofed/librdmacm/examples/build/cmatose/Makefile Wed Dec
3 09:10:41 2014 (r275449)
@@ -6,5 +6,6 @@ PROG= cmatose
MAN=
SRCS= cmatose.c
LDADD+= -libverbs -lrdmacm -lpthread
+LDADD+= -lmlx4
.include <bsd.prog.mk>
Modified: stable/9/contrib/ofed/librdmacm/examples/build/mckey/Makefile
==============================================================================
--- stable/9/contrib/ofed/librdmacm/examples/build/mckey/Makefile Wed Dec
3 09:08:04 2014 (r275448)
+++ stable/9/contrib/ofed/librdmacm/examples/build/mckey/Makefile Wed Dec
3 09:10:41 2014 (r275449)
@@ -6,5 +6,6 @@ PROG= mckey
MAN=
SRCS= mckey.c
LDADD+= -libverbs -lrdmacm -lpthread
+LDADD+= -lmlx4
.include <bsd.prog.mk>
Modified: stable/9/contrib/ofed/librdmacm/examples/build/rping/Makefile
==============================================================================
--- stable/9/contrib/ofed/librdmacm/examples/build/rping/Makefile Wed Dec
3 09:08:04 2014 (r275448)
+++ stable/9/contrib/ofed/librdmacm/examples/build/rping/Makefile Wed Dec
3 09:10:41 2014 (r275449)
@@ -6,5 +6,6 @@ PROG= rping
MAN=
SRCS= rping.c
LDADD+= -libverbs -lrdmacm -lpthread
+LDADD+= -lmlx4
.include <bsd.prog.mk>
Modified: stable/9/contrib/ofed/librdmacm/examples/build/udaddy/Makefile
==============================================================================
--- stable/9/contrib/ofed/librdmacm/examples/build/udaddy/Makefile Wed Dec
3 09:08:04 2014 (r275448)
+++ stable/9/contrib/ofed/librdmacm/examples/build/udaddy/Makefile Wed Dec
3 09:10:41 2014 (r275449)
@@ -6,5 +6,6 @@ PROG= udaddy
MAN=
SRCS= udaddy.c
LDADD+= -libverbs -lrdmacm -lpthread
+LDADD+= -lmlx4
.include <bsd.prog.mk>
Modified: stable/9/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c
==============================================================================
--- stable/9/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c
Wed Dec 3 09:08:04 2014 (r275448)
+++ stable/9/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c
Wed Dec 3 09:10:41 2014 (r275449)
@@ -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: stable/9/contrib/ofed/management/infiniband-diags/src/ibroute.c
==============================================================================
--- stable/9/contrib/ofed/management/infiniband-diags/src/ibroute.c Wed Dec
3 09:08:04 2014 (r275448)
+++ stable/9/contrib/ofed/management/infiniband-diags/src/ibroute.c Wed Dec
3 09:10:41 2014 (r275449)
@@ -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: stable/9/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c
==============================================================================
--- stable/9/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c Wed Dec
3 09:08:04 2014 (r275448)
+++ stable/9/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c Wed Dec
3 09:10:41 2014 (r275449)
@@ -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: stable/9/contrib/ofed/management/infiniband-diags/src/ibtracert.c
==============================================================================
--- stable/9/contrib/ofed/management/infiniband-diags/src/ibtracert.c Wed Dec
3 09:08:04 2014 (r275448)
+++ stable/9/contrib/ofed/management/infiniband-diags/src/ibtracert.c Wed Dec
3 09:10:41 2014 (r275449)
@@ -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: stable/9/contrib/ofed/management/infiniband-diags/src/saquery.c
==============================================================================
--- stable/9/contrib/ofed/management/infiniband-diags/src/saquery.c Wed Dec
3 09:08:04 2014 (r275448)
+++ stable/9/contrib/ofed/management/infiniband-diags/src/saquery.c Wed Dec
3 09:10:41 2014 (r275449)
@@ -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: stable/9/contrib/ofed/management/infiniband-diags/src/smpquery.c
==============================================================================
--- stable/9/contrib/ofed/management/infiniband-diags/src/smpquery.c Wed Dec
3 09:08:04 2014 (r275448)
+++ stable/9/contrib/ofed/management/infiniband-diags/src/smpquery.c Wed Dec
3 09:10:41 2014 (r275449)
@@ -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: stable/9/contrib/ofed/usr.bin/Makefile.inc
==============================================================================
--- stable/9/contrib/ofed/usr.bin/Makefile.inc Wed Dec 3 09:08:04 2014
(r275448)
+++ stable/9/contrib/ofed/usr.bin/Makefile.inc Wed Dec 3 09:10:41 2014
(r275449)
@@ -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
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
