svn commit: r275108 - in stable/9/contrib/ofed: librdmacm/examples librdmacm/examples/build usr.lib

[Hans Petter Selasky]

Author: hselasky
Date: Wed Nov 26 09:43:31 2014
New Revision: 275108
URL: https://svnweb.freebsd.org/changeset/base/275108

Log:
  MFC r273774:
  Make some infiniband example utilities easily buildable:
  - Add new Makefiles.
  - Add more include directories when building.
  - Fixed a printf() formatting string.
  
  Sponsored by:	Mellanox Technologies

Added:
  stable/9/contrib/ofed/librdmacm/examples/build/
     - copied from r273774, head/contrib/ofed/librdmacm/examples/build/
Modified:
  stable/9/contrib/ofed/librdmacm/examples/rping.c
  stable/9/contrib/ofed/usr.lib/Makefile.inc
Directory Properties:
  stable/9/contrib/   (props changed)

Modified: stable/9/contrib/ofed/librdmacm/examples/rping.c
==============================================================================
--- stable/9/contrib/ofed/librdmacm/examples/rping.c	Wed Nov 26 09:37:35 2014	(r275107)
+++ stable/9/contrib/ofed/librdmacm/examples/rping.c	Wed Nov 26 09:43:31 2014	(r275108)
@@ -1148,8 +1148,9 @@ int main(int argc, char *argv[])
 			if ((cb->size < RPING_MIN_BUFSIZE) ||
 			    (cb->size > (RPING_BUFSIZE - 1))) {
 				fprintf(stderr, "Invalid size %d "
-				       "(valid range is %Zd to %d)\n",
-				       cb->size, RPING_MIN_BUFSIZE, RPING_BUFSIZE);
+				       "(valid range is %d to %d)\n",
+				       (int)cb->size, (int)(RPING_MIN_BUFSIZE),
+				       (int)(RPING_BUFSIZE));
 				ret = EINVAL;
 			} else
 				DEBUG_LOG("size %d\n", (int) atoi(optarg));

Modified: stable/9/contrib/ofed/usr.lib/Makefile.inc
==============================================================================
--- stable/9/contrib/ofed/usr.lib/Makefile.inc	Wed Nov 26 09:37:35 2014	(r275107)
+++ stable/9/contrib/ofed/usr.lib/Makefile.inc	Wed Nov 26 09:43:31 2014	(r275108)
@@ -7,11 +7,18 @@ COMPLIBDIR=	${OPENSMDIR}/complib
 VENDORLIBDIR=	${OPENSMDIR}/libvendor
 IBVERBSDIR=	${.CURDIR}/../../libibverbs
 IBINC=		${.CURDIR}/../../include
+RDMACMDIR=	${.CURDIR}/../../librdmacm
+
+CFLAGS+=	-I${.CURDIR} \
+		-I${IBINC}/infiniband \
+		-I${IBINC} \
+		-I${IBCOMMONDIR}/include/infiniband \
+		-I${IBCOMMONDIR}/include \
+		-I${IBMADDIR}/include/infiniband \
+		-I${IBMADDIR}/include \
+		-I${UMADDIR}/include/infiniband \
+		-I${UMADDIR}/include \
+		-I${OPENSMDIR}/include \
+		-I${RDMACMDIR}/include \
+		-I${IBVERBSDIR}/include
 
-CFLAGS+=	-I${.CURDIR} -I${IBINC}/infiniband
-CFLAGS+=	-I${IBCOMMONDIR}/include/infiniband
-CFLAGS+=	-I${IBMADDIR}/include/infiniband
-CFLAGS+=	-I${UMADDIR}/include/infiniband
-CFLAGS+=	-I${OPENSMDIR}/include
-# CFLAGS+=	-I${UMADDIR}/include
-# CFLAGS+=	-I${IBVERBSDIR}/include