d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly prefix the infiniband include directory for buildworld. This fixes

Browse Source 
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
This commit is contained in:
Hans Petter Selasky 2017-12-05 08:25:17 +00:00
parent 69097cd8da
commit be28698cf2
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/ofed/infiniband-diags/build/Makefile.inc
View File

@ -4,7 +4,7 @@
BINDIR?= /usr/bin BINDIR?= /usr/bin
SRCS+= ibdiag_common.c ibdiag_sa.c SRCS+= ibdiag_common.c ibdiag_sa.c
CFLAGS+= -I${INCLUDEDIR}/infiniband CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
CFLAGS+= -DHAVE_CONFIG_H=1 CFLAGS+= -DHAVE_CONFIG_H=1
CFLAGS+= -I${.CURDIR}/../../ CFLAGS+= -I${.CURDIR}/../../
CFLAGS+= -I${.CURDIR}/../../src CFLAGS+= -I${.CURDIR}/../../src

2
contrib/ofed/libibnetdisc/Makefile
View File

@ -27,7 +27,7 @@ ibnd_show_progress.3
LIBADD= osmcomp ibmad ibumad LIBADD= osmcomp ibmad ibumad
CFLAGS+= -DHAVE_CONFIG_H=1 CFLAGS+= -DHAVE_CONFIG_H=1
CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}
CFLAGS+= -I${INCLUDEDIR}/infiniband CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
VERSION_MAP= ${.CURDIR}/libibnetdisc.map VERSION_MAP= ${.CURDIR}/libibnetdisc.map
.include <bsd.lib.mk> .include <bsd.lib.mk>

2
contrib/ofed/opensm/complib/Makefile
View File

@ -27,7 +27,7 @@ cl_vector.c \
ib_statustext.c ib_statustext.c
CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1 CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1
CFLAGS+= -I${INCLUDEDIR}/infiniband CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
LIBADD= pthread LIBADD= pthread
VERSION_MAP= ${.CURDIR}/libosmcomp.map VERSION_MAP= ${.CURDIR}/libosmcomp.map

2
contrib/ofed/opensm/libopensm/Makefile
View File

@ -14,7 +14,7 @@ osm_helper.c
LIBADD= pthread LIBADD= pthread
CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1 CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1
CFLAGS+= -I${INCLUDEDIR}/infiniband CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
VERSION_MAP= ${.CURDIR}/../opensm/libopensm.map VERSION_MAP= ${.CURDIR}/../opensm/libopensm.map
.include <bsd.lib.mk> .include <bsd.lib.mk>

2
contrib/ofed/opensm/libvendor/Makefile
View File

@ -13,7 +13,7 @@ osm_vendor_ibumad_sa.c
LIBADD= ibumad pthread LIBADD= ibumad pthread
CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1 CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1
CFLAGS+= -I${INCLUDEDIR}/infiniband CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
VERSION_MAP= ${.CURDIR}/libosmvendor.map VERSION_MAP= ${.CURDIR}/libosmvendor.map
.include <bsd.lib.mk> .include <bsd.lib.mk>

2
contrib/ofed/opensm/opensm/Makefile
View File

@ -95,7 +95,7 @@ st.c
MAN= opensm.8 MAN= opensm.8
CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1 CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1
CFLAGS+= -I${INCLUDEDIR}/infiniband CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
LIBADD= opensm osmvendor osmcomp wrap pthread LIBADD= opensm osmvendor osmcomp wrap pthread
.include <bsd.prog.mk> .include <bsd.prog.mk>