From owner-dev-commits-ports-main@freebsd.org Sat Apr 24 18:44:16 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 64BAD626C66; Sat, 24 Apr 2021 18:44:16 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSKnX2Hbjz3Qrk; Sat, 24 Apr 2021 18:44:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 416ED25572; Sat, 24 Apr 2021 18:44:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13OIiGJZ021443; Sat, 24 Apr 2021 18:44:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13OIiGvh021442; Sat, 24 Apr 2021 18:44:16 GMT (envelope-from git) Date: Sat, 24 Apr 2021 18:44:16 GMT Message-Id: <202104241844.13OIiGvh021442@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: f7dc9143c86d - main - benchmarks/wrk: add luajit and luajit-openresty flavors. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7dc9143c86d53b6cb3b5b5bd5461ee8c3c2b60c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2021 18:44:16 -0000 The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=f7dc9143c86d53b6cb3b5b5bd5461ee8c3c2b60c commit f7dc9143c86d53b6cb3b5b5bd5461ee8c3c2b60c Author: Sergey A. Osokin AuthorDate: 2021-04-24 18:35:02 +0000 Commit: Sergey A. Osokin CommitDate: 2021-04-24 18:35:02 +0000 benchmarks/wrk: add luajit and luajit-openresty flavors. Bump PORTREVISION. --- benchmarks/wrk/Makefile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/benchmarks/wrk/Makefile b/benchmarks/wrk/Makefile index 2a18a5fa616f..4ba96d4ee84b 100644 --- a/benchmarks/wrk/Makefile +++ b/benchmarks/wrk/Makefile @@ -2,6 +2,7 @@ PORTNAME= wrk PORTVERSION= 4.1.0 +PORTREVISION= 1 CATEGORIES= benchmarks www MAINTAINER= osa@FreeBSD.org @@ -9,15 +10,29 @@ COMMENT= Modern HTTP benchmarking tool LICENSE= APACHE20 -LIB_DEPENDS= libluajit-5.1.so:lang/luajit - USE_GITHUB= yes GH_ACCOUNT= wg +FLAVORS= luajit luajitor +FLAVOR?= ${FLAVORS:[1]} + +luajit_PKGNAMESUFFIX= -luajit +luajitor_PKGNAMESUFFIX= -luajit-openresty + +luajit_CONFLICTS_INSTALL= ${PORTNAME}-luajit-openresty +luajitor_CONFLICTS_INSTALL= ${PORTNAME}-luajit + USES= gmake ssl USE_CSTD= c99 LLD_UNSAFE= yes +.if ${FLAVOR} == luajit CFLAGS+= -I${LOCALBASE}/include/luajit-2.0 +LIB_DEPENDS= libluajit-5.1.so:lang/luajit +.else +CFLAGS+= -I${LOCALBASE}/include/luajit-2.1 +LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty +.endif + MAKE_ENV+= WITH_OPENSSL=${OPENSSLBASE} WITH_LUAJIT=${LOCALBASE} VER=${PORTVERSION} PLIST_FILES= bin/wrk