From owner-svn-ports-head@freebsd.org Fri Feb 14 12:20:26 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DBFD523260D; Fri, 14 Feb 2020 12:20:26 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48JssQ5R05z4VRt; Fri, 14 Feb 2020 12:20:26 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9BA2E2369B; Fri, 14 Feb 2020 12:20:26 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01ECKQhA064955; Fri, 14 Feb 2020 12:20:26 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01ECKQ0Z064954; Fri, 14 Feb 2020 12:20:26 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202002141220.01ECKQ0Z064954@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 14 Feb 2020 12:20:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526106 - head/net/libfabric X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/net/libfabric X-SVN-Commit-Revision: 526106 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2020 12:20:26 -0000 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 '' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|||' @${FIND} ${WRKSRC} -name "*.[ch]" -and -exec ${GREP} -q '' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|||' @${FIND} ${WRKSRC} -name "*.[ch]" -and -exec ${GREP} -q '' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|||' + @${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