Date: Fri, 14 Feb 2020 12:20:26 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526106 - head/net/libfabric Message-ID: <202002141220.01ECKQ0Z064954@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Feb 14 12:20:26 2020 New Revision: 526106 URL: https://svnweb.freebsd.org/changeset/ports/526106 Log: net/libfabric: unbreak build after r525983 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 Reported by: pkg-fallout Reviewed by: Jan Kokemüller (epoll-shim upstream) Approved by: yuri (maintainer) Modified: head/net/libfabric/Makefile (contents, props changed) Modified: head/net/libfabric/Makefile ============================================================================== --- head/net/libfabric/Makefile Fri Feb 14 11:49:57 2020 (r526105) +++ head/net/libfabric/Makefile Fri Feb 14 12:20:26 2020 (r526106) @@ -41,9 +41,23 @@ ${p}_DESC= '${p:tl}' provider ${p}_CONFIGURE_ENABLE= ${p:tl} .endfor +SED_WRAP_CLOSE= { \ + i\\\n \ + \#ifdef SHIM_SYS_SHIM_HELPERS\\\n \ + \#undef close\\\n \ + \#endif\n \ + a\\\n \ + \#ifdef SHIM_SYS_SHIM_HELPERS\\\n \ + \#define close epoll_shim_close\\\n \ + \#endif\n \ + } + 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} -Flr --include='*.c' '.close' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} $$'/\\.close/${SED_WRAP_CLOSE}' + @${REINPLACE_CMD} $$'/fi_ops.*close/${SED_WRAP_CLOSE}' ${WRKSRC}/src/fabric.c + @${REINPLACE_CMD} $$'/[*>]close/${SED_WRAP_CLOSE}' ${WRKSRC}/include/rdma/fabric.h .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002141220.01ECKQ0Z064954>