From owner-svn-ports-all@freebsd.org Thu Nov 8 08:54:37 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB9B21122CFD; Thu, 8 Nov 2018 08:54:37 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3701674F18; Thu, 8 Nov 2018 08:54:37 +0000 (UTC) (envelope-from yuri@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 180382255D; Thu, 8 Nov 2018 08:54:37 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA88saDl091150; Thu, 8 Nov 2018 08:54:36 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA88sagW091149; Thu, 8 Nov 2018 08:54:36 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201811080854.wA88sagW091149@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Thu, 8 Nov 2018 08:54:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484440 - head/net/libfabric X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/net/libfabric X-SVN-Commit-Revision: 484440 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3701674F18 X-Spamd-Result: default: False [-103.11 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Nov 2018 08:54:38 -0000 Author: yuri Date: Thu Nov 8 08:54:36 2018 New Revision: 484440 URL: https://svnweb.freebsd.org/changeset/ports/484440 Log: net/libfabric: Add port options for individual providers; Enclose the VERBS option in .if/.else Requested by: mat (VERBS option .if/.else enclosure) Modified: head/net/libfabric/Makefile head/net/libfabric/pkg-plist Modified: head/net/libfabric/Makefile ============================================================================== --- head/net/libfabric/Makefile Thu Nov 8 08:38:09 2018 (r484439) +++ head/net/libfabric/Makefile Thu Nov 8 08:54:36 2018 (r484440) @@ -3,6 +3,7 @@ PORTNAME= libfabric DISTVERSIONPREFIX= v DISTVERSION= 1.6.2 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org @@ -21,19 +22,23 @@ CONFIGURE_ARGS= --disable-static USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include/libepoll-shim -LDFLAGS+= ${LOCALBASE}/lib/libepoll-shim.so -pthread +LDFLAGS+= ${LOCALBASE}/lib/libepoll-shim.so -OPTIONS_DEFINE= VERBS -OPTIONS_SUB= yes +OPTIONS_MULTI= PROVIDERS +OPTIONS_MULTI_PROVIDERS= RXD RXM SOCKETS TCP UDP +OPTIONS_DEFAULT= ${OPTIONS_MULTI_PROVIDERS} +OPTIONS_SUB= yes +PROVIDERS_DESC= Providers to build: -VERBS_DESC= Build 'verbs' provider -VERBS_CONFIGURE_ENABLE= verbs - .if exists(/usr/include/infiniband/verbs.h) # some earlier FreeBSD 11 systems don't have it -OPTIONS_DEFAULT+= VERBS -.else -VERBS_BROKEN= infiniband/verbs.h not available on your system +OPTIONS_MULTI_PROVIDERS+= VERBS +VERBS_PLIST_FILES= man/man7/fi_verbs.7.gz .endif + +.for p in ${OPTIONS_MULTI_PROVIDERS} +${p}_DESC= '${p:tl}' provider +${p}_CONFIGURE_ENABLE= ${p:tl} +.endfor post-patch: @${FIND} ${WRKSRC} -name "*.[ch]" -and -exec ${GREP} -q '' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|||' Modified: head/net/libfabric/pkg-plist ============================================================================== --- head/net/libfabric/pkg-plist Thu Nov 8 08:38:09 2018 (r484439) +++ head/net/libfabric/pkg-plist Thu Nov 8 08:54:36 2018 (r484440) @@ -149,7 +149,6 @@ man/man3/fi_writev.3.gz man/man7/fabric.7.gz man/man7/fi_direct.7.gz man/man7/fi_provider.7.gz -man/man7/fi_rxm.7.gz -man/man7/fi_sockets.7.gz -man/man7/fi_udp.7.gz -%%VERBS%%man/man7/fi_verbs.7.gz +%%RXM%%man/man7/fi_rxm.7.gz +%%SOCKETS%%man/man7/fi_sockets.7.gz +%%UDP%%man/man7/fi_udp.7.gz