From owner-svn-src-all@FreeBSD.ORG Wed Nov 26 09:37:36 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E73FBFC8; Wed, 26 Nov 2014 09:37:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B7ED1C1A; Wed, 26 Nov 2014 09:37:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQ9baMA038100; Wed, 26 Nov 2014 09:37:36 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQ9bakU038097; Wed, 26 Nov 2014 09:37:36 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201411260937.sAQ9bakU038097@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 26 Nov 2014 09:37:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r275107 - in stable/10/contrib/ofed: librdmacm/examples librdmacm/examples/build usr.lib X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 09:37:37 -0000 Author: hselasky Date: Wed Nov 26 09:37:35 2014 New Revision: 275107 URL: https://svnweb.freebsd.org/changeset/base/275107 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/10/contrib/ofed/librdmacm/examples/build/ - copied from r273774, head/contrib/ofed/librdmacm/examples/build/ Modified: stable/10/contrib/ofed/librdmacm/examples/rping.c stable/10/contrib/ofed/usr.lib/Makefile.inc Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/ofed/librdmacm/examples/rping.c ============================================================================== --- stable/10/contrib/ofed/librdmacm/examples/rping.c Wed Nov 26 08:44:05 2014 (r275106) +++ stable/10/contrib/ofed/librdmacm/examples/rping.c Wed Nov 26 09:37:35 2014 (r275107) @@ -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/10/contrib/ofed/usr.lib/Makefile.inc ============================================================================== --- stable/10/contrib/ofed/usr.lib/Makefile.inc Wed Nov 26 08:44:05 2014 (r275106) +++ stable/10/contrib/ofed/usr.lib/Makefile.inc Wed Nov 26 09:37:35 2014 (r275107) @@ -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