Attachment 211634 Details for Bug 244106 – undef conflicts

[patch] undef conflicts

undef-conflicts.diff (text/plain), 2.91 KB, created by Jan Beich on 2020-02-14 02:20:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2020-02-14 02:20:44 UTC

Size: 2.91 KB

patch

obsolete

>From b5110516eb2d8f78378c6cbb87ef693a1d951b65 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>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:		244103
>Reviewed by:	Jan KokemÃ¼ller (epoll-shim upstream)
>Approved by:	yuri (maintainer)
>---
> net/libfabric/Makefile | 5 +++++
> 1 file changed, 5 insertions(+)
>
>diff --git a/net/libfabric/Makefile b/net/libfabric/Makefile
>index b86484e3f54b..90e3dde4cf69 100644
>--- a/net/libfabric/Makefile
>+++ b/net/libfabric/Makefile
>@@ -45,5 +45,10 @@ post-patch:
> 	@${FIND} ${WRKSRC} -name "*.[ch]" -and -exec ${GREP} -q '<asm/types\.h>' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|<asm/types\.h>|<sys/types.h>|'
> 	@${FIND} ${WRKSRC} -name "*.[ch]" -and -exec ${GREP} -q '<malloc\.h>' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|<malloc\.h>|<stdlib.h>|'
> 	@${FIND} ${WRKSRC} -name "*.[ch]" -and -exec ${GREP} -q '<alloca\.h>' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|<alloca\.h>|<stdlib.h>|'
>+	@${GREP} --include='*.c' -Flr '.close' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} $$'/\\.close/i\\\n#ifdef SHIM_SYS_SHIM_HELPERS\\\n#undef close\\\n#endif\n'
>+	@${REINPLACE_CMD} $$'/fi_ops.*close/i\\\n#ifdef SHIM_SYS_SHIM_HELPERS\\\n#undef close\\\n#endif\n' ${WRKSRC}/src/fabric.c
>+	@${REINPLACE_CMD} -e $$'/\\*close/i\\\n#ifdef SHIM_SYS_SHIM_HELPERS\\\n#undef close\\\n#endif\n' \
>+		-e $$'/ops->close/a\\\n#ifdef SHIM_SYS_SHIM_HELPERS\\\n#define close epoll_shim_close\\\n#endif\n' \
>+		${WRKSRC}/include/rdma/fabric.h
> 
> .include <bsd.port.mk>

Flags:

yuri: maintainer-approval+

Actions: View | Diff

Attachments on bug 244106: 211623 | 211624 | 211633 | 211634