Date: Mon, 3 Jan 2011 22:58:22 +0000 (UTC) From: Jeff Roberson <jeff@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r216935 - in projects/ofed/head: contrib/ofed/include/infiniband contrib/ofed/include/rdma contrib/ofed/libibverbs/include/infiniband contrib/ofed/librdmacm/src contrib/ofed/management/... Message-ID: <201101032258.p03MwMkY008067@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jeff Date: Mon Jan 3 22:58:22 2011 New Revision: 216935 URL: http://svn.freebsd.org/changeset/base/216935 Log: - Move byteswap.h and endian.h from sys/ofed/include to usr/include/infiniband which is a more natural location for these compatibility headers. - Use ${.CURDIR} where appropriate. - Protect the ALIGN() define to prevent redefinition. Sponsored by: Isilon Systems, iX Systems, and Panasas. Added: projects/ofed/head/contrib/ofed/include/infiniband/byteswap.h projects/ofed/head/contrib/ofed/include/infiniband/endian.h Deleted: projects/ofed/head/sys/ofed/include/byteswap.h projects/ofed/head/sys/ofed/include/endian.h Modified: projects/ofed/head/contrib/ofed/include/infiniband/Makefile projects/ofed/head/contrib/ofed/include/rdma/Makefile projects/ofed/head/contrib/ofed/libibverbs/include/infiniband/arch.h projects/ofed/head/contrib/ofed/librdmacm/src/cma.c projects/ofed/head/contrib/ofed/management/libibcommon/include/infiniband/common.h projects/ofed/head/contrib/ofed/usr.bin/Makefile.inc projects/ofed/head/contrib/ofed/usr.bin/ibaddr/Makefile projects/ofed/head/contrib/ofed/usr.bin/ibnetdiscover/Makefile projects/ofed/head/contrib/ofed/usr.bin/ibping/Makefile projects/ofed/head/contrib/ofed/usr.bin/ibportstate/Makefile projects/ofed/head/contrib/ofed/usr.bin/ibroute/Makefile projects/ofed/head/contrib/ofed/usr.bin/ibsendtrap/Makefile projects/ofed/head/contrib/ofed/usr.bin/ibstat/Makefile projects/ofed/head/contrib/ofed/usr.bin/ibsysstat/Makefile projects/ofed/head/contrib/ofed/usr.bin/ibtracert/Makefile projects/ofed/head/contrib/ofed/usr.bin/opensm/Makefile projects/ofed/head/contrib/ofed/usr.bin/perfquery/Makefile projects/ofed/head/contrib/ofed/usr.bin/saquery/Makefile projects/ofed/head/contrib/ofed/usr.bin/sminfo/Makefile projects/ofed/head/contrib/ofed/usr.bin/smpdump/Makefile projects/ofed/head/contrib/ofed/usr.bin/smpquery/Makefile projects/ofed/head/contrib/ofed/usr.bin/vendstat/Makefile projects/ofed/head/contrib/ofed/usr.lib/libibcm/Makefile projects/ofed/head/contrib/ofed/usr.lib/libibcommon/Makefile projects/ofed/head/contrib/ofed/usr.lib/libibmad/Makefile projects/ofed/head/contrib/ofed/usr.lib/libibumad/Makefile projects/ofed/head/contrib/ofed/usr.lib/libibverbs/Makefile projects/ofed/head/contrib/ofed/usr.lib/libmlx4/Makefile projects/ofed/head/contrib/ofed/usr.lib/libmthca/Makefile projects/ofed/head/contrib/ofed/usr.lib/libopensm/Makefile projects/ofed/head/contrib/ofed/usr.lib/libosmcomp/Makefile projects/ofed/head/contrib/ofed/usr.lib/libosmvendor/Makefile projects/ofed/head/contrib/ofed/usr.lib/librdmacm/Makefile projects/ofed/head/contrib/ofed/usr.lib/libsdp/Makefile Modified: projects/ofed/head/contrib/ofed/include/infiniband/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/include/infiniband/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/include/infiniband/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -1,28 +1,28 @@ .include <bsd.own.mk> INCS= -IBINCS= types.h byteorder.h +IBINCS= byteorder.h byteswap.h endian.h types.h IBINCSDIR= ${INCLUDEDIR}/infiniband -IBVERBS= ../../libibverbs/include/infiniband +IBVERBS= ${.CURDIR}/../../libibverbs/include/infiniband VERBINCS= ${IBVERBS}/arch.h ${IBVERBS}/driver.h ${IBVERBS}/kern-abi.h VERBINCS+= ${IBVERBS}/marshall.h ${IBVERBS}/opcode.h VERBINCS+= ${IBVERBS}/sa-kern-abi.h ${IBVERBS}/sa.h ${IBVERBS}/verbs.h VERBINCSDIR= ${INCLUDEDIR}/infiniband -IBCOMMON= ../../management/libibcommon/include/infiniband +IBCOMMON= ${.CURDIR}/../../management/libibcommon/include/infiniband COMMONINCS= ${IBCOMMON}/common.h COMMONINCSDIR= ${INCLUDEDIR}/infiniband -IBMAD= ../../management/libibmad/include/infiniband +IBMAD= ${.CURDIR}/../../management/libibmad/include/infiniband MADINCS= ${IBMAD}/mad.h MADINCSDIR= ${INCLUDEDIR}/infiniband -IBUMAD= ../../management/libibumad/include/infiniband +IBUMAD= ${.CURDIR}/../../management/libibumad/include/infiniband UMADINCS= ${IBUMAD}/umad.h UMADINCSDIR= ${INCLUDEDIR}/infiniband -COMPLIB= ../../management/opensm/include/complib +COMPLIB= ${.CURDIR}/../../management/opensm/include/complib COMPLIBINCS= ${COMPLIB}/cl_atomic.h ${COMPLIB}/cl_atomic_osd.h COMPLIBINCS+= ${COMPLIB}/cl_byteswap.h ${COMPLIB}/cl_byteswap_osd.h COMPLIBINCS+= ${COMPLIB}/cl_comppool.h ${COMPLIB}/cl_debug.h @@ -43,11 +43,11 @@ COMPLIBINCS+= ${COMPLIB}/cl_timer_osd.h COMPLIBINCS+= ${COMPLIB}/cl_types_osd.h ${COMPLIB}/cl_vector.h COMPLIBINCSDIR= ${INCLUDEDIR}/infiniband/complib -IBADIR= ../../management/opensm/include/iba +IBADIR= ${.CURDIR}/../../management/opensm/include/iba IBAINCS= ${IBADIR}/ib_cm_types.h ${IBADIR}/ib_types.h IBAINCSDIR= ${INCLUDEDIR}/infiniband/iba -OPENSM= ../../management/opensm/include/opensm +OPENSM= ${.CURDIR}/../../management/opensm/include/opensm OPENSMINCS= ${OPENSM}/osm_attrib_req.h ${OPENSM}/osm_base.h OPENSMINCS+= ${OPENSM}/osm_config.h ${OPENSM}/osm_console.h @@ -75,7 +75,7 @@ OPENSMINCS+= ${OPENSM}/osm_ucast_mgr.h $ OPENSMINCS+= ${OPENSM}/osm_vl15intf.h ${OPENSM}/st.h OPENSMINCSDIR= ${INCLUDEDIR}/infiniband/opensm -VENDOR= ../../management/opensm/include/vendor +VENDOR= ${.CURDIR}/../../management/opensm/include/vendor VENDORINCS= ${VENDOR}/osm_mtl_bind.h ${VENDOR}/osm_pkt_randomizer.h VENDORINCS+= ${VENDOR}/osm_ts_useraccess.h ${VENDOR}/osm_umadt.h VENDORINCS+= ${VENDOR}/osm_vendor.h ${VENDOR}/osm_vendor_al.h @@ -97,7 +97,7 @@ VENDORINCS+= ${VENDOR}/osm_vendor_test.h VENDORINCS+= ${VENDOR}/osm_vendor_umadt.h VENDORINCSDIR= ${INCLUDEDIR}/infiniband/vendor -IBCM= ../../libibcm/include/infiniband +IBCM= ${.CURDIR}/../../libibcm/include/infiniband IBCMINCS= ${IBCM}/cm.h ${IBCM}/cm_abi.h IBCMINCSDIR= ${INCLUDEDIR}/infiniband Added: projects/ofed/head/contrib/ofed/include/infiniband/byteswap.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ofed/head/contrib/ofed/include/infiniband/byteswap.h Mon Jan 3 22:58:22 2011 (r216935) @@ -0,0 +1,42 @@ +/*- + * Copyright (c) 2010 Isilon Systems, Inc. + * Copyright (c) 2010 iX Systems, Inc. + * Copyright (c) 2010 Panasas, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _INFINIBAND_BYTESWAP_H_ +#define _INFINIBAND_BYTESWAP_H_ +/* + * This file is included for compatibility with the userland libraries + * accompanying the infiniband stack. + */ +#include <sys/types.h> +#include <sys/endian.h> + +#define bswap_16 bswap16 +#define bswap_32 bswap32 +#define bswap_64 bswap64 + +#endif /* _INFINIBAND_BYTESWAP_H_ */ Added: projects/ofed/head/contrib/ofed/include/infiniband/endian.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ofed/head/contrib/ofed/include/infiniband/endian.h Mon Jan 3 22:58:22 2011 (r216935) @@ -0,0 +1,42 @@ +/*- + * Copyright (c) 2010 Isilon Systems, Inc. + * Copyright (c) 2010 iX Systems, Inc. + * Copyright (c) 2010 Panasas, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/* + * This file is included for compatibility with the userland libraries + * accompanying the infiniband stack. + */ + +#ifndef _INFINIBAND_ENDIAN_H_ +#define _INFINIBAND_ENDIAN_H_ + +#include <sys/types.h> +#include <sys/endian.h> +#define __LITTLE_ENDIAN _LITTLE_ENDIAN +#define __BIG_ENDIAN _BIG_ENDIAN +#define __BYTE_ORDER _BYTE_ORDER + +#endif /* _INFINIBAND_ENDIAN_H_ */ Modified: projects/ofed/head/contrib/ofed/include/rdma/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/include/rdma/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/include/rdma/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -1,7 +1,7 @@ .include <bsd.own.mk> INCS= -RDMACM= ../../librdmacm/include/rdma +RDMACM= ${.CURDIR}/../../librdmacm/include/rdma RDMACMINCS= ${RDMACM}/rdma_cma.h ${RDMACM}/rdma_cma_abi.h RDMACMINCSDIR= ${INCLUDEDIR}/rdma Modified: projects/ofed/head/contrib/ofed/libibverbs/include/infiniband/arch.h ============================================================================== --- projects/ofed/head/contrib/ofed/libibverbs/include/infiniband/arch.h Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/libibverbs/include/infiniband/arch.h Mon Jan 3 22:58:22 2011 (r216935) @@ -34,8 +34,8 @@ #define INFINIBAND_ARCH_H #include <stdint.h> -#include <endian.h> -#include <byteswap.h> +#include <infiniband/endian.h> +#include <infiniband/byteswap.h> #if __BYTE_ORDER == __LITTLE_ENDIAN static inline uint64_t htonll(uint64_t x) { return bswap_64(x); } Modified: projects/ofed/head/contrib/ofed/librdmacm/src/cma.c ============================================================================== --- projects/ofed/head/contrib/ofed/librdmacm/src/cma.c Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/librdmacm/src/cma.c Mon Jan 3 22:58:22 2011 (r216935) @@ -46,8 +46,8 @@ #include <poll.h> #include <unistd.h> #include <pthread.h> -#include <endian.h> -#include <byteswap.h> +#include <infiniband/endian.h> +#include <infiniband/byteswap.h> #include <stddef.h> #include <infiniband/driver.h> Modified: projects/ofed/head/contrib/ofed/management/libibcommon/include/infiniband/common.h ============================================================================== --- projects/ofed/head/contrib/ofed/management/libibcommon/include/infiniband/common.h Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/management/libibcommon/include/infiniband/common.h Mon Jan 3 22:58:22 2011 (r216935) @@ -38,7 +38,7 @@ #include <sys/types.h> #include <dirent.h> #include <stdint.h> -#include <byteswap.h> +#include <infiniband/byteswap.h> #ifdef __cplusplus # define BEGIN_C_DECLS extern "C" { @@ -80,10 +80,12 @@ static inline uint64_t htonll(uint64_t x /* Misc. macros: */ /** align value \a l to \a size (ceil) */ +#ifndef ALIGN #define ALIGN(l, size) (((l) + ((size) - 1)) / (size) * (size)) /** align value \a l to \a sizeof 32 bit int (ceil) */ #define ALIGN32(l) (ALIGN((l), sizeof(uint32))) +#endif /** printf style debugging MACRO, conmmon header includes name of function */ #define IBWARN(fmt, args...) ibwarn(__FUNCTION__, fmt, ## args) Modified: projects/ofed/head/contrib/ofed/usr.bin/Makefile.inc ============================================================================== --- projects/ofed/head/contrib/ofed/usr.bin/Makefile.inc Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.bin/Makefile.inc Mon Jan 3 22:58:22 2011 (r216935) @@ -1,3 +1,2 @@ -OFEDSYS= ../../../../sys/ofed DIAGPATH= ${.CURDIR}/../../management/infiniband-diags BINDIR?= /usr/bin Modified: projects/ofed/head/contrib/ofed/usr.bin/ibaddr/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.bin/ibaddr/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.bin/ibaddr/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -6,7 +6,7 @@ PROG= ibaddr SRCS= ibaddr.c ibdiag_common.c LDADD= -libumad -libcommon -libmad -CFLAGS+= -I${DIAGPATH}/include -I${OFEDSYS}/include +CFLAGS+= -I${DIAGPATH}/include MAN= ibaddr.8 WARNS?= 1 Modified: projects/ofed/head/contrib/ofed/usr.bin/ibnetdiscover/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.bin/ibnetdiscover/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.bin/ibnetdiscover/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -6,7 +6,7 @@ PROG= ibnetdiscover SRCS= ibnetdiscover.c grouping.c ibdiag_common.c LDADD= -libumad -libcommon -libmad -losmcomp -CFLAGS+= -I${DIAGPATH}/include -I${OFEDSYS}/include -I/usr/include/infiniband +CFLAGS+= -I${DIAGPATH}/include -I/usr/include/infiniband CFLAGS+= -pthread MAN= ibnetdiscover.8 Modified: projects/ofed/head/contrib/ofed/usr.bin/ibping/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.bin/ibping/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.bin/ibping/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -6,7 +6,7 @@ PROG= ibping SRCS= ibping.c ibdiag_common.c LDADD= -libumad -libcommon -libmad -CFLAGS+= -I${DIAGPATH}/include -I${OFEDSYS}/include +CFLAGS+= -I${DIAGPATH}/include MAN= ibping.8 WARNS?= 1 Modified: projects/ofed/head/contrib/ofed/usr.bin/ibportstate/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.bin/ibportstate/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.bin/ibportstate/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -6,7 +6,7 @@ PROG= ibportstate SRCS= ibportstate.c ibdiag_common.c LDADD= -libumad -libcommon -libmad -CFLAGS+= -I${DIAGPATH}/include -I${OFEDSYS}/include +CFLAGS+= -I${DIAGPATH}/include MAN= ibportstate.8 WARNS?= 1 Modified: projects/ofed/head/contrib/ofed/usr.bin/ibroute/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.bin/ibroute/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.bin/ibroute/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -6,7 +6,7 @@ PROG= ibroute SRCS= ibroute.c ibdiag_common.c LDADD= -libumad -libcommon -libmad -losmcomp -CFLAGS+= -I${DIAGPATH}/include -I${OFEDSYS}/include -I/usr/include/infiniband +CFLAGS+= -I${DIAGPATH}/include -I/usr/include/infiniband CFLAGS+= -pthread MAN= ibroute.8 Modified: projects/ofed/head/contrib/ofed/usr.bin/ibsendtrap/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.bin/ibsendtrap/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.bin/ibsendtrap/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -6,7 +6,7 @@ PROG= ibsendtrap SRCS= ibsendtrap.c ibdiag_common.c LDADD= -libumad -libcommon -libmad -CFLAGS+= -I${DIAGPATH}/include -I${OFEDSYS}/include -I/usr/include/infiniband +CFLAGS+= -I${DIAGPATH}/include -I/usr/include/infiniband NO_MAN= true WARNS?= 1 Modified: projects/ofed/head/contrib/ofed/usr.bin/ibstat/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.bin/ibstat/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.bin/ibstat/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -6,7 +6,7 @@ PROG= ibstat SRCS= ibstat.c LDADD= -libumad -libcommon -CFLAGS+= -I${DIAGPATH}/include -I${OFEDSYS}/include +CFLAGS+= -I${DIAGPATH}/include -I/usr/include/infiniband MAN= ibstat.8 WARNS?= 1 Modified: projects/ofed/head/contrib/ofed/usr.bin/ibsysstat/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.bin/ibsysstat/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.bin/ibsysstat/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -6,7 +6,7 @@ PROG= ibsysstat SRCS= ibsysstat.c ibdiag_common.c LDADD= -libumad -libcommon -libmad -CFLAGS+= -I${DIAGPATH}/include -I${OFEDSYS}/include +CFLAGS+= -I${DIAGPATH}/include MAN= ibsysstat.8 WARNS?= 1 Modified: projects/ofed/head/contrib/ofed/usr.bin/ibtracert/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.bin/ibtracert/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.bin/ibtracert/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -6,7 +6,7 @@ PROG= ibtracert SRCS= ibtracert.c ibdiag_common.c LDADD= -libumad -libcommon -libmad -losmcomp -CFLAGS+= -I${DIAGPATH}/include -I${OFEDSYS}/include -I/usr/include/infiniband +CFLAGS+= -I${DIAGPATH}/include -I/usr/include/infiniband CFLAGS+= -pthread MAN= ibtracert.8 Modified: projects/ofed/head/contrib/ofed/usr.bin/opensm/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.bin/opensm/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.bin/opensm/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -2,7 +2,7 @@ .include "../Makefile.inc" -OPENSM = ../../management/opensm +OPENSM = ${.CURDIR}/../../management/opensm .PATH: ${OPENSM}/opensm ${OPENSM}/man PROG= opensm @@ -30,7 +30,7 @@ SRCS+= osm_dump.c osm_ucast_cache.c osm_ SRCS+= osm_qos_policy.c LDADD= -lopensm -losmvendor -losmcomp -libmad -libumad -libcommon -CFLAGS+= -I${OFEDSYS}/include -I/usr/include/infiniband +CFLAGS+= -I/usr/include/infiniband CFLAGS+= -pthread CFLAGS+= -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP Modified: projects/ofed/head/contrib/ofed/usr.bin/perfquery/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.bin/perfquery/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.bin/perfquery/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -6,7 +6,7 @@ PROG= perfquery SRCS= perfquery.c ibdiag_common.c LDADD= -libumad -libcommon -libmad -CFLAGS+= -I${DIAGPATH}/include -I${OFEDSYS}/include +CFLAGS+= -I${DIAGPATH}/include MAN= perfquery.8 WARNS?= 1 Modified: projects/ofed/head/contrib/ofed/usr.bin/saquery/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.bin/saquery/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.bin/saquery/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -6,7 +6,7 @@ PROG= saquery SRCS= saquery.c ibdiag_common.c LDADD= -libumad -libcommon -libmad -losmcomp -losmvendor -lopensm -CFLAGS+= -I${DIAGPATH}/include -I${OFEDSYS}/include -I/usr/include/infiniband +CFLAGS+= -I${DIAGPATH}/include -I/usr/include/infiniband CFLAGS+= -DOSM_VENDOR_INTF_OPENIB -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP CFLAGS+= -pthread MAN= saquery.8 Modified: projects/ofed/head/contrib/ofed/usr.bin/sminfo/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.bin/sminfo/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.bin/sminfo/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -6,7 +6,7 @@ PROG= sminfo SRCS= sminfo.c ibdiag_common.c LDADD= -libumad -libcommon -libmad -CFLAGS+= -I${DIAGPATH}/include -I${OFEDSYS}/include +CFLAGS+= -I${DIAGPATH}/include MAN= sminfo.8 WARNS?= 1 Modified: projects/ofed/head/contrib/ofed/usr.bin/smpdump/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.bin/smpdump/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.bin/smpdump/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -6,7 +6,7 @@ PROG= smpdump SRCS= smpdump.c LDADD= -libumad -libcommon -libmad -CFLAGS+= -I${DIAGPATH}/include -I${OFEDSYS}/include +CFLAGS+= -I${DIAGPATH}/include -I/usr/include/infiniband MAN= smpdump.8 WARNS?= 1 Modified: projects/ofed/head/contrib/ofed/usr.bin/smpquery/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.bin/smpquery/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.bin/smpquery/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -6,7 +6,7 @@ PROG= smpquery SRCS= smpquery.c ibdiag_common.c LDADD= -libumad -libcommon -libmad -losmcomp -CFLAGS+= -I${DIAGPATH}/include -I${OFEDSYS}/include -I/usr/include/infiniband/ +CFLAGS+= -I${DIAGPATH}/include -I/usr/include/infiniband/ CFLAGS+= -pthread MAN= smpquery.8 Modified: projects/ofed/head/contrib/ofed/usr.bin/vendstat/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.bin/vendstat/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.bin/vendstat/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -6,7 +6,7 @@ PROG= vendstat SRCS= vendstat.c ibdiag_common.c LDADD= -libumad -libcommon -libmad -CFLAGS+= -I${DIAGPATH}/include -I${OFEDSYS}/include +CFLAGS+= -I${DIAGPATH}/include MAN= vendstat.8 WARNS?= 1 Modified: projects/ofed/head/contrib/ofed/usr.lib/libibcm/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.lib/libibcm/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.lib/libibcm/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -4,7 +4,7 @@ SHLIBDIR?= /usr/lib .include <bsd.own.mk> -IBCMDIR= ../../libibcm +IBCMDIR= ${.CURDIR}/../../libibcm IBSRCDIR= ${IBCMDIR}/src .PATH: ${IBSRCDIR} Modified: projects/ofed/head/contrib/ofed/usr.lib/libibcommon/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.lib/libibcommon/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.lib/libibcommon/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -4,9 +4,8 @@ SHLIBDIR?= /usr/lib .include <bsd.own.mk> -IBCOMMONDIR= ../../management/libibcommon +IBCOMMONDIR= ${.CURDIR}/../../management/libibcommon IBSRCDIR= ${IBCOMMONDIR}/src -OFEDSYS= ../../../../sys/ofed .PATH: ${IBSRCDIR} @@ -16,7 +15,7 @@ NO_PROFILE= SRCS= sysfs.c util.c hash.c stack.c time.c -CFLAGS+= -I${.CURDIR} -I${IBSRCDIR} -I${OFEDSYS}/include -I/usr/include/infiniband +CFLAGS+= -I${.CURDIR} -I${IBSRCDIR} -I/usr/include/infiniband VERSION_MAP= ${IBSRCDIR}/libibcommon.map Modified: projects/ofed/head/contrib/ofed/usr.lib/libibmad/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.lib/libibmad/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.lib/libibmad/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -4,10 +4,9 @@ SHLIBDIR?= /usr/lib .include <bsd.own.mk> -IBMADDIR= ../../management/libibmad -UMADDIR= ../../management/libibumad/include +IBMADDIR= ${.CURDIR}/../../management/libibmad +UMADDIR= ${.CURDIR}/../../management/libibumad/include IBSRCDIR= ${IBMADDIR}/src -OFEDSYS= ../../../../sys/ofed .PATH: ${IBSRCDIR} @@ -20,7 +19,7 @@ SRCS= dump.c fields.c gs.c mad.c portid. CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${IBSRCDIR} -I${IBMADDIR}/include -CFLAGS+= -I/usr/include/infiniband -I${OFEDSYS}/include +CFLAGS+= -I/usr/include/infiniband VERSION_MAP= ${IBSRCDIR}/libibmad.map Modified: projects/ofed/head/contrib/ofed/usr.lib/libibumad/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.lib/libibumad/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.lib/libibumad/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -4,9 +4,8 @@ SHLIBDIR?= /usr/lib .include <bsd.own.mk> -UMADDIR= ../../management/libibumad +UMADDIR= ${.CURDIR}/../../management/libibumad IBSRCDIR= ${UMADDIR}/src -OFEDSYS= ../../../../sys/ofed .PATH: ${IBSRCDIR} @@ -17,7 +16,7 @@ NO_PROFILE= SRCS= umad.c CFLAGS+= -DHAVE_CONFIG_H -CFLAGS+= -I${.CURDIR} -I/usr/include/infiniband -I${OFEDSYS}/include +CFLAGS+= -I${.CURDIR} -I/usr/include/infiniband VERSION_MAP= ${IBSRCDIR}/libibumad.map Modified: projects/ofed/head/contrib/ofed/usr.lib/libibverbs/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.lib/libibverbs/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.lib/libibverbs/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -4,10 +4,9 @@ SHLIBDIR?= /usr/lib .include <bsd.own.mk> -IBVERBSDIR= ../../libibverbs +IBVERBSDIR= ${.CURDIR}/../../libibverbs IBSRCDIR= ${IBVERBSDIR}/src IBMANDIR= ${IBVERBSDIR}/man -OFEDSYS= ../../../../sys/ofed .PATH: ${IBSRCDIR} ${IBMANDIR} @@ -34,7 +33,7 @@ MAN= ibv_alloc_pd.3 ibv_asyncwatch.1 ibv CFLAGS+= -DHAVE_CONFIG_H -DIBV_CONFIG_DIR=\"/etc/ibverbs/\" -CFLAGS+= -I${.CURDIR} -I${IBSRCDIR} -I${IBVERBSDIR}/include -I${OFEDSYS}/include +CFLAGS+= -I${.CURDIR} -I${IBSRCDIR} -I${IBVERBSDIR}/include VERSION_MAP= ${IBSRCDIR}/libibverbs.map Modified: projects/ofed/head/contrib/ofed/usr.lib/libmlx4/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.lib/libmlx4/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.lib/libmlx4/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -4,10 +4,9 @@ SHLIBDIR?= /usr/lib .include <bsd.own.mk> -MLX4DIR= ../../libmlx4 -IBVERBSDIR= ../../libibverbs +MLX4DIR= ${.CURDIR}/../../libmlx4 +IBVERBSDIR= ${.CURDIR}/../../libibverbs MLXSRCDIR= ${MLX4DIR}/src -OFEDSYS= ../../../../sys/ofed .PATH: ${MLXSRCDIR} @@ -19,7 +18,6 @@ SRCS= buf.c cq.c dbrec.c mlx4.c qp.c srq CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${MLXSRCDIR} -I${IBVERBSDIR}/include -CFLAGS+= -I${OFEDSYS}/include VERSION_MAP= ${MLXSRCDIR}/mlx4.map Modified: projects/ofed/head/contrib/ofed/usr.lib/libmthca/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.lib/libmthca/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.lib/libmthca/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -4,10 +4,9 @@ SHLIBDIR?= /usr/lib .include <bsd.own.mk> -MTHCADIR= ../../libmthca -IBVERBSDIR= ../../libibverbs +MTHCADIR= ${.CURDIR}/../../libmthca +IBVERBSDIR= ${.CURDIR}/../../libibverbs MTHCASRCDIR= ${MTHCADIR}/src -OFEDSYS= ../../../../sys/ofed .PATH: ${MTHCASRCDIR} @@ -20,7 +19,6 @@ SRCS= ah.c buf.c cq.c memfree.c mthca.c CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${MTHCASRCDIR} -I${IBVERBSDIR}/include -CFLAGS+= -I${OFEDSYS}/include VERSION_MAP= ${MTHCASRCDIR}/mthca.map Modified: projects/ofed/head/contrib/ofed/usr.lib/libopensm/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.lib/libopensm/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.lib/libopensm/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -4,8 +4,7 @@ SHLIBDIR?= /usr/lib .include <bsd.own.mk> -OPENSMDIR= ../../management/opensm/opensm -OFEDSYS= ../../../../sys/ofed +OPENSMDIR= ${.CURDIR}/../../management/opensm/opensm .PATH: ${OPENSMDIR} @@ -15,7 +14,7 @@ NO_PROFILE= SRCS= osm_log.c osm_mad_pool.c osm_helper.c -CFLAGS+= -I${.CURDIR} -I/usr/include/infiniband -I${OFEDSYS}/include +CFLAGS+= -I${.CURDIR} -I/usr/include/infiniband VERSION_MAP= ${OPENSMDIR}/libopensm.map Modified: projects/ofed/head/contrib/ofed/usr.lib/libosmcomp/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.lib/libosmcomp/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.lib/libosmcomp/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -4,8 +4,7 @@ SHLIBDIR?= /usr/lib .include <bsd.own.mk> -COMPLIBDIR= ../../management/opensm/complib -OFEDSYS= ../../../../sys/ofed +COMPLIBDIR= ${.CURDIR}/../../management/opensm/complib .PATH: ${COMPLIBDIR} @@ -18,7 +17,7 @@ SRCS+= cl_log.c cl_map.c cl_pool.c cl_pt SRCS+= cl_statustext.c cl_thread.c cl_threadpool.c cl_timer.c cl_vector.c SRCS+= ib_statustext.c cl_nodenamemap.c -CFLAGS+= -I${.CURDIR} -I/usr/include/infiniband -I${OFEDSYS}/include +CFLAGS+= -I${.CURDIR} -I/usr/include/infiniband VERSION_MAP= ${COMPLIBDIR}/libosmcomp.map Modified: projects/ofed/head/contrib/ofed/usr.lib/libosmvendor/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.lib/libosmvendor/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.lib/libosmvendor/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -4,8 +4,7 @@ SHLIBDIR?= /usr/lib .include <bsd.own.mk> -VENDORLIBDIR= ../../management/opensm/libvendor -OFEDSYS= ../../../../sys/ofed +VENDORLIBDIR= ${.CURDIR}/../../management/opensm/libvendor .PATH: ${VENDORLIBDIR} @@ -15,7 +14,7 @@ NO_PROFILE= SRCS= osm_vendor_ibumad.c osm_vendor_ibumad_sa.c -CFLAGS+= -I${.CURDIR} -I/usr/include/infiniband -I${OFEDSYS}/include +CFLAGS+= -I${.CURDIR} -I/usr/include/infiniband CFLAGS+= -DOSM_VENDOR_INTF_OPENIB VERSION_MAP= ${VENDORLIBDIR}/libosmvendor.map Modified: projects/ofed/head/contrib/ofed/usr.lib/librdmacm/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.lib/librdmacm/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.lib/librdmacm/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -4,7 +4,7 @@ SHLIBDIR?= /usr/lib .include <bsd.own.mk> -RDMACMDIR= ../../librdmacm +RDMACMDIR= ${.CURDIR}/../../librdmacm RDMASRCDIR= ${RDMACMDIR}/src RDMAMANDIR= ${RDMACMDIR}/man @@ -14,7 +14,7 @@ LIB= rdmacm SHLIB_MAJOR= 1 NO_PROFILE= -SRCS= cma.c +SRCS= cma.c MAN= rdma_get_devices.3 mckey.1 rdma_get_dst_port.3 rdma_accept.3 MAN+= rdma_get_local_addr.3 rdma_ack_cm_event.3 rdma_get_peer_addr.3 @@ -27,7 +27,6 @@ MAN+= rdma_resolve_route.3 rdma_disconne MAN+= rdma_event_str.3 rping.1 rdma_free_devices.3 ucmatose.1 MAN+= rdma_get_cm_event.3 udaddy.1 -CFLAGS+= -I../../../../sys/ofed/include VERSION_MAP= ${RDMASRCDIR}/librdmacm.map Modified: projects/ofed/head/contrib/ofed/usr.lib/libsdp/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.lib/libsdp/Makefile Mon Jan 3 22:48:01 2011 (r216934) +++ projects/ofed/head/contrib/ofed/usr.lib/libsdp/Makefile Mon Jan 3 22:58:22 2011 (r216935) @@ -4,7 +4,7 @@ SHLIBDIR?= /usr/lib .include <bsd.own.mk> -SDPDIR= ../../libsdp/src +SDPDIR= ${.CURDIR}/../../libsdp/src .PATH: ${SDPDIR}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101032258.p03MwMkY008067>