From be28698cf226998a1f3e91f5ca6075b6fd54de08 Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky Date: Tue, 5 Dec 2017 08:25:17 +0000 Subject: [PATCH] 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 --- contrib/ofed/infiniband-diags/build/Makefile.inc | 2 +- contrib/ofed/libibnetdisc/Makefile | 2 +- contrib/ofed/opensm/complib/Makefile | 2 +- contrib/ofed/opensm/libopensm/Makefile | 2 +- contrib/ofed/opensm/libvendor/Makefile | 2 +- contrib/ofed/opensm/opensm/Makefile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/ofed/infiniband-diags/build/Makefile.inc b/contrib/ofed/infiniband-diags/build/Makefile.inc index 60b4c7000e75..54b6d80cb637 100644 --- a/contrib/ofed/infiniband-diags/build/Makefile.inc +++ b/contrib/ofed/infiniband-diags/build/Makefile.inc @@ -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 diff --git a/contrib/ofed/libibnetdisc/Makefile b/contrib/ofed/libibnetdisc/Makefile index 9f674ea4d062..acd6ef602e74 100644 --- a/contrib/ofed/libibnetdisc/Makefile +++ b/contrib/ofed/libibnetdisc/Makefile @@ -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 diff --git a/contrib/ofed/opensm/complib/Makefile b/contrib/ofed/opensm/complib/Makefile index b45d6ea73624..f3005ff928a4 100644 --- a/contrib/ofed/opensm/complib/Makefile +++ b/contrib/ofed/opensm/complib/Makefile @@ -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 diff --git a/contrib/ofed/opensm/libopensm/Makefile b/contrib/ofed/opensm/libopensm/Makefile index 5ffcd995eb87..6e6b688b39b0 100644 --- a/contrib/ofed/opensm/libopensm/Makefile +++ b/contrib/ofed/opensm/libopensm/Makefile @@ -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 diff --git a/contrib/ofed/opensm/libvendor/Makefile b/contrib/ofed/opensm/libvendor/Makefile index 3728ba979743..9a90fac1428e 100644 --- a/contrib/ofed/opensm/libvendor/Makefile +++ b/contrib/ofed/opensm/libvendor/Makefile @@ -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 diff --git a/contrib/ofed/opensm/opensm/Makefile b/contrib/ofed/opensm/opensm/Makefile index 3702f7bd258d..a22d2fb65734 100644 --- a/contrib/ofed/opensm/opensm/Makefile +++ b/contrib/ofed/opensm/opensm/Makefile @@ -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