From 0fcbcdf125ccb979fcb9ce55b9d66491d5575ed9 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Thu, 13 Feb 2020 19:11:18 +0000 Subject: [PATCH] net/libfabric: unbreak after r525983 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit src/fabric.c:683:7: error: no member named 'epoll_shim_close' in 'fi_ops' FI_CHECK_OP(info->nic->fid.ops, struct fi_ops, close)) { ^ ~~~~~ ./include/rdma/fabric.h:555:23: note: expanded from macro 'FI_CHECK_OP' (ops && (ops->size > offsetof(opstype, op)) && ops->op) ^ ~~ /usr/include/stddef.h:73:31: note: expanded from macro 'offsetof' #define offsetof(type, field) __offsetof(type, field) ^ ~~~~~ /usr/include/sys/cdefs.h:487:34: note: expanded from macro '__offsetof' #define __offsetof(type, field) __builtin_offsetof(type, field) ^ ~~~~~ src/fabric.c:683:54: error: no member named 'epoll_shim_close' in 'struct fi_ops' FI_CHECK_OP(info->nic->fid.ops, struct fi_ops, close)) { ~~~~~~~~~~~~~~~~~~ ^ /usr/local/include/libepoll-shim/sys/epoll.h:74:15: note: expanded from macro 'close' #define close epoll_shim_close ^ ./include/rdma/fabric.h:555:54: note: expanded from macro 'FI_CHECK_OP' (ops && (ops->size > offsetof(opstype, op)) && ops->op) ~~~ ^ PR: 244106 Reviewed by: Jan Kokemüller (epoll-shim upstream) Approved by: yuri (maintainer) --- net/libfabric/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/libfabric/Makefile b/net/libfabric/Makefile index b86484e3f54b..a97167013465 100644 --- a/net/libfabric/Makefile +++ b/net/libfabric/Makefile @@ -20,7 +20,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-static USE_LDCONFIG= yes -CFLAGS+= -I${LOCALBASE}/include/libepoll-shim +CFLAGS+= -I${LOCALBASE}/include/libepoll-shim -DSHIM_SYS_SHIM_HELPERS LDFLAGS+= ${LOCALBASE}/lib/libepoll-shim.so INSTALL_TARGET= install-strip