From owner-svn-src-head@freebsd.org Tue Dec 5 08:25:19 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2831DFC3F3; Tue, 5 Dec 2017 08:25:19 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 8A0E27094D; Tue, 5 Dec 2017 08:25:19 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB58PIIV087025; Tue, 5 Dec 2017 08:25:18 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB58PI1g087019; Tue, 5 Dec 2017 08:25:18 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201712050825.vB58PI1g087019@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 5 Dec 2017 08:25:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326563 - in head/contrib/ofed: infiniband-diags/build libibnetdisc opensm/complib opensm/libopensm opensm/libvendor opensm/opensm X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in head/contrib/ofed: infiniband-diags/build libibnetdisc opensm/complib opensm/libopensm opensm/libvendor opensm/opensm X-SVN-Commit-Revision: 326563 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2017 08:25:19 -0000 Author: hselasky Date: Tue Dec 5 08:25:17 2017 New Revision: 326563 URL: https://svnweb.freebsd.org/changeset/base/326563 Log: Correctly prefix the infiniband include directory for buildworld. This fixes the OFED buildworld target, WITH_OFED=YES, when the include files are not already installed locally, but only in the temporary object directory. Found by: kib Sponsored by: Mellanox Technologies Modified: head/contrib/ofed/infiniband-diags/build/Makefile.inc head/contrib/ofed/libibnetdisc/Makefile head/contrib/ofed/opensm/complib/Makefile head/contrib/ofed/opensm/libopensm/Makefile head/contrib/ofed/opensm/libvendor/Makefile head/contrib/ofed/opensm/opensm/Makefile Modified: head/contrib/ofed/infiniband-diags/build/Makefile.inc ============================================================================== --- head/contrib/ofed/infiniband-diags/build/Makefile.inc Tue Dec 5 07:21:47 2017 (r326562) +++ head/contrib/ofed/infiniband-diags/build/Makefile.inc Tue Dec 5 08:25:17 2017 (r326563) @@ -4,7 +4,7 @@ BINDIR?= /usr/bin SRCS+= ibdiag_common.c ibdiag_sa.c -CFLAGS+= -I${INCLUDEDIR}/infiniband +CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband CFLAGS+= -DHAVE_CONFIG_H=1 CFLAGS+= -I${.CURDIR}/../../ CFLAGS+= -I${.CURDIR}/../../src Modified: head/contrib/ofed/libibnetdisc/Makefile ============================================================================== --- head/contrib/ofed/libibnetdisc/Makefile Tue Dec 5 07:21:47 2017 (r326562) +++ head/contrib/ofed/libibnetdisc/Makefile Tue Dec 5 08:25:17 2017 (r326563) @@ -27,7 +27,7 @@ ibnd_show_progress.3 LIBADD= osmcomp ibmad ibumad CFLAGS+= -DHAVE_CONFIG_H=1 CFLAGS+= -I${.CURDIR} -CFLAGS+= -I${INCLUDEDIR}/infiniband +CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband VERSION_MAP= ${.CURDIR}/libibnetdisc.map .include Modified: head/contrib/ofed/opensm/complib/Makefile ============================================================================== --- head/contrib/ofed/opensm/complib/Makefile Tue Dec 5 07:21:47 2017 (r326562) +++ head/contrib/ofed/opensm/complib/Makefile Tue Dec 5 08:25:17 2017 (r326563) @@ -27,7 +27,7 @@ cl_vector.c \ ib_statustext.c CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1 -CFLAGS+= -I${INCLUDEDIR}/infiniband +CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband LIBADD= pthread VERSION_MAP= ${.CURDIR}/libosmcomp.map Modified: head/contrib/ofed/opensm/libopensm/Makefile ============================================================================== --- head/contrib/ofed/opensm/libopensm/Makefile Tue Dec 5 07:21:47 2017 (r326562) +++ head/contrib/ofed/opensm/libopensm/Makefile Tue Dec 5 08:25:17 2017 (r326563) @@ -14,7 +14,7 @@ osm_helper.c LIBADD= pthread CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1 -CFLAGS+= -I${INCLUDEDIR}/infiniband +CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband VERSION_MAP= ${.CURDIR}/../opensm/libopensm.map .include Modified: head/contrib/ofed/opensm/libvendor/Makefile ============================================================================== --- head/contrib/ofed/opensm/libvendor/Makefile Tue Dec 5 07:21:47 2017 (r326562) +++ head/contrib/ofed/opensm/libvendor/Makefile Tue Dec 5 08:25:17 2017 (r326563) @@ -13,7 +13,7 @@ osm_vendor_ibumad_sa.c LIBADD= ibumad pthread CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1 -CFLAGS+= -I${INCLUDEDIR}/infiniband +CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband VERSION_MAP= ${.CURDIR}/libosmvendor.map .include Modified: head/contrib/ofed/opensm/opensm/Makefile ============================================================================== --- head/contrib/ofed/opensm/opensm/Makefile Tue Dec 5 07:21:47 2017 (r326562) +++ head/contrib/ofed/opensm/opensm/Makefile Tue Dec 5 08:25:17 2017 (r326563) @@ -95,7 +95,7 @@ st.c MAN= opensm.8 CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1 -CFLAGS+= -I${INCLUDEDIR}/infiniband +CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband LIBADD= opensm osmvendor osmcomp wrap pthread .include