From owner-svn-src-stable@FreeBSD.ORG Wed Dec 3 09:08:08 2014 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 11F69104; Wed, 3 Dec 2014 09:08:08 +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 E7D69628; Wed, 3 Dec 2014 09:08:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB3987Ni074571; Wed, 3 Dec 2014 09:08:07 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB398572074554; Wed, 3 Dec 2014 09:08:05 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201412030908.sB398572074554@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 3 Dec 2014 09:08:05 +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: r275448 - in stable/10/contrib/ofed: librdmacm/examples/build/cmatose librdmacm/examples/build/mckey librdmacm/examples/build/rping librdmacm/examples/build/udaddy management/infiniband... X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Dec 2014 09:08:08 -0000 Author: hselasky Date: Wed Dec 3 09:08:04 2014 New Revision: 275448 URL: https://svnweb.freebsd.org/changeset/base/275448 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/10/contrib/ofed/librdmacm/examples/build/cmatose/Makefile stable/10/contrib/ofed/librdmacm/examples/build/mckey/Makefile stable/10/contrib/ofed/librdmacm/examples/build/rping/Makefile stable/10/contrib/ofed/librdmacm/examples/build/udaddy/Makefile stable/10/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c stable/10/contrib/ofed/management/infiniband-diags/src/ibroute.c stable/10/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c stable/10/contrib/ofed/management/infiniband-diags/src/ibtracert.c stable/10/contrib/ofed/management/infiniband-diags/src/saquery.c stable/10/contrib/ofed/management/infiniband-diags/src/smpquery.c stable/10/contrib/ofed/usr.bin/Makefile.inc Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/ofed/librdmacm/examples/build/cmatose/Makefile ============================================================================== --- stable/10/contrib/ofed/librdmacm/examples/build/cmatose/Makefile Wed Dec 3 09:05:53 2014 (r275447) +++ stable/10/contrib/ofed/librdmacm/examples/build/cmatose/Makefile Wed Dec 3 09:08:04 2014 (r275448) @@ -6,5 +6,6 @@ PROG= cmatose MAN= SRCS= cmatose.c LDADD+= -libverbs -lrdmacm -lpthread +LDADD+= -lmlx4 .include Modified: stable/10/contrib/ofed/librdmacm/examples/build/mckey/Makefile ============================================================================== --- stable/10/contrib/ofed/librdmacm/examples/build/mckey/Makefile Wed Dec 3 09:05:53 2014 (r275447) +++ stable/10/contrib/ofed/librdmacm/examples/build/mckey/Makefile Wed Dec 3 09:08:04 2014 (r275448) @@ -6,5 +6,6 @@ PROG= mckey MAN= SRCS= mckey.c LDADD+= -libverbs -lrdmacm -lpthread +LDADD+= -lmlx4 .include Modified: stable/10/contrib/ofed/librdmacm/examples/build/rping/Makefile ============================================================================== --- stable/10/contrib/ofed/librdmacm/examples/build/rping/Makefile Wed Dec 3 09:05:53 2014 (r275447) +++ stable/10/contrib/ofed/librdmacm/examples/build/rping/Makefile Wed Dec 3 09:08:04 2014 (r275448) @@ -6,5 +6,6 @@ PROG= rping MAN= SRCS= rping.c LDADD+= -libverbs -lrdmacm -lpthread +LDADD+= -lmlx4 .include Modified: stable/10/contrib/ofed/librdmacm/examples/build/udaddy/Makefile ============================================================================== --- stable/10/contrib/ofed/librdmacm/examples/build/udaddy/Makefile Wed Dec 3 09:05:53 2014 (r275447) +++ stable/10/contrib/ofed/librdmacm/examples/build/udaddy/Makefile Wed Dec 3 09:08:04 2014 (r275448) @@ -6,5 +6,6 @@ PROG= udaddy MAN= SRCS= udaddy.c LDADD+= -libverbs -lrdmacm -lpthread +LDADD+= -lmlx4 .include Modified: stable/10/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c ============================================================================== --- stable/10/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c Wed Dec 3 09:05:53 2014 (r275447) +++ stable/10/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c Wed Dec 3 09:08:04 2014 (r275448) @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include "ibnetdiscover.h" #include "grouping.h" Modified: stable/10/contrib/ofed/management/infiniband-diags/src/ibroute.c ============================================================================== --- stable/10/contrib/ofed/management/infiniband-diags/src/ibroute.c Wed Dec 3 09:05:53 2014 (r275447) +++ stable/10/contrib/ofed/management/infiniband-diags/src/ibroute.c Wed Dec 3 09:08:04 2014 (r275448) @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include "ibdiag_common.h" Modified: stable/10/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c ============================================================================== --- stable/10/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c Wed Dec 3 09:05:53 2014 (r275447) +++ stable/10/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c Wed Dec 3 09:08:04 2014 (r275448) @@ -43,7 +43,7 @@ #include #include -#include +#include #include "ibdiag_common.h" Modified: stable/10/contrib/ofed/management/infiniband-diags/src/ibtracert.c ============================================================================== --- stable/10/contrib/ofed/management/infiniband-diags/src/ibtracert.c Wed Dec 3 09:05:53 2014 (r275447) +++ stable/10/contrib/ofed/management/infiniband-diags/src/ibtracert.c Wed Dec 3 09:08:04 2014 (r275448) @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include "ibdiag_common.h" Modified: stable/10/contrib/ofed/management/infiniband-diags/src/saquery.c ============================================================================== --- stable/10/contrib/ofed/management/infiniband-diags/src/saquery.c Wed Dec 3 09:05:53 2014 (r275447) +++ stable/10/contrib/ofed/management/infiniband-diags/src/saquery.c Wed Dec 3 09:08:04 2014 (r275448) @@ -50,12 +50,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include Modified: stable/10/contrib/ofed/management/infiniband-diags/src/smpquery.c ============================================================================== --- stable/10/contrib/ofed/management/infiniband-diags/src/smpquery.c Wed Dec 3 09:05:53 2014 (r275447) +++ stable/10/contrib/ofed/management/infiniband-diags/src/smpquery.c Wed Dec 3 09:08:04 2014 (r275448) @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include "ibdiag_common.h" Modified: stable/10/contrib/ofed/usr.bin/Makefile.inc ============================================================================== --- stable/10/contrib/ofed/usr.bin/Makefile.inc Wed Dec 3 09:05:53 2014 (r275447) +++ stable/10/contrib/ofed/usr.bin/Makefile.inc Wed Dec 3 09:08:04 2014 (r275448) @@ -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