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 <bsd.lib.mk>
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 <bsd.lib.mk>
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 <bsd.lib.mk>
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 <bsd.prog.mk>
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
