From nobody Sat Oct 15 17:49:51 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MqW3z4Sx3z4fMkG; Sat, 15 Oct 2022 17:49:51 +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 4MqW3z3v76z4253; Sat, 15 Oct 2022 17:49:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665856191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yxfm/Hqm7kfLtUikkzgED2/htw/2fihP1LEfeHIudEs=; b=LrB6ffAIMXuZdZGACCLSUp9Eiz4OZ9PA3/yzjyl4HcmVeTPtEjIniXKJZUt0ZUQAnweDl6 flZUxU5nQPyq3XetTyGB9JKrsrhpHe9JL7BccvyP9eO+k+0uZD5gTdVqYNZrUtba4bMWYw 2bxYUXMI0m+8C4lfMRaQrU7EsNSQRg39RYGA4aR3LU+6phlvOpsYG1zMCX6bQbmqBsAFt9 j+D2VHZOhK6UifTu29KVs8VkX5Fn9ojXB0IyCKsAkeUhvSA4Fn+xGbnvAdt2q9rk6/hHnh 0q78598sj9K21Lq7EnSnchc0vAJWcO2dg4D7N+26JYTlDfbLIA4A/E+t93p0nA== 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 4MqW3z2vfTz1BJ4; Sat, 15 Oct 2022 17:49:51 +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 29FHnpLE073971; Sat, 15 Oct 2022 17:49:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29FHnpIn073970; Sat, 15 Oct 2022 17:49:51 GMT (envelope-from git) Date: Sat, 15 Oct 2022 17:49:51 GMT Message-Id: <202210151749.29FHnpIn073970@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: b5d0d7bd56c0 - main - databases/redis6: Use USES=luajit (defaults to luajit-devel) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5d0d7bd56c0cba7748cd49b0d695dd7cadc9f5b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665856191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yxfm/Hqm7kfLtUikkzgED2/htw/2fihP1LEfeHIudEs=; b=CUpPa+XUYKX7C7cmiWix3nb5wW088JowZc9Dta4C5kP7RGGkoJwz6Xg1NaqcsaDbum6TBQ gMoJQUwoT0SqyJ9KSwmhlp9XV2O61GtVtESPpz2uQ+/5KW2BEHdyaNx8EQBlHGlHJO4Bw1 tOjJgSzYvLvp0Ko5gdZoJYlevEMSfR9EOWPDcQdoUvk50rEDyoDcJwNhQfVxKLo2GtZAFf wTKtNcli/uDzwicQ7DJ598MvT/DHay7hdWmet8iZra/99NbEmzPcllclY/8ZcyiWjPc9HH +a/lthvTgib0bzl4pbH6tV9LbHjomsuJOlCiogS660agr77rr73wgh8A7IE24Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665856191; a=rsa-sha256; cv=none; b=wyjoPTXuX4zM1UGH7sl9M/fICfFB5Uhaqy87X9M+DiYwj839xqwCm4wRYzIectmSy79umY MOKamYqMqK3KAmGDNnJT7FeUJT3Alu/HzUF54/nfTruzPdJvkQB1iA4r0YGptnk/wVJhcb brQhgLo1/dBuFSNeeTA1vrick9G3u4Rq+HEa6vxpw7iZunCQ4rV6ip9mocYEsfHK31eeLZ BHyuEWZUtrWdBk/kR+StHO309nCOfaxE3dwYMw6OHIUC2943GWfFqrEq5quEW1Fgr/OpAZ k7IdNR+Mqp4wETv7WdN1FUpXqXKwIE+cBaoMULj9JqkdKcepuTPoUuL25rJqjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=b5d0d7bd56c0cba7748cd49b0d695dd7cadc9f5b commit b5d0d7bd56c0cba7748cd49b0d695dd7cadc9f5b Author: Adam Weinberger AuthorDate: 2022-10-15 17:49:47 +0000 Commit: Adam Weinberger CommitDate: 2022-10-15 17:49:47 +0000 databases/redis6: Use USES=luajit (defaults to luajit-devel) --- databases/redis6/Makefile | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/databases/redis6/Makefile b/databases/redis6/Makefile index bec404f30af8..6e30e1d7ff76 100644 --- a/databases/redis6/Makefile +++ b/databases/redis6/Makefile @@ -1,6 +1,6 @@ PORTNAME= redis PORTVERSION= 6.0.16 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= https://download.redis.io/releases/ PKGNAMESUFFIX= 6 @@ -22,25 +22,17 @@ CONFLICTS_INSTALL= redis redis-devel # etc/rc.d/redis OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB OPTIONS_DEFAULT= TLS OPTIONS_RADIO= EXTLUA -OPTIONS_RADIO_EXTLUA= LUA LUAJIT LUAJITOR +OPTIONS_RADIO_EXTLUA= LUA LUAJIT OPTIONS_SUB= yes JEMALLOC_DESC= Use jemalloc -LUAJITOR_DESC= Use lang/luajit-openresty instead of builtin lua -LUAJIT_DESC= Use lang/luajit instead of builtin lua +LUAJIT_DESC= Use luajit instead of builtin lua LUA_DESC= Use lang/lua instead of builtin lua TESTS_DESC= Install lang/tcl for redis unit tests TLS_DESC= Use TLS (openssl req.) TRIB_DESC= Install redis-trib.rb (lang/ruby req.) JEMALLOC_MAKE_ENV= USE_JEMALLOC=yes -LUAJITOR_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.1/lua.h:lang/luajit-openresty -LUAJITOR_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty -LUAJITOR_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ - ${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c -LUAJITOR_VARS= _ADDFLAGS=true -LUAJIT_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.0/lua.h:lang/luajit -LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit -LUAJIT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit +LUAJIT_USES= luajit LUAJIT_VARS= _ADDFLAGS=true LUA_USES= lua:51 LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.lua @@ -65,6 +57,15 @@ CFLAGS+= -fPIC LDFLAGS+= -Wl,-E .endif +.if ${PORT_OPTIONS:MLUAJIT} +. if ${LUAJIT_VER} == luajit +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit +. else +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ + ${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c +. endif +.endif + LDFLAGS+= -lpthread -lm -lexecinfo CONFLICTS?= redis-[1-9].* redis-devel-* redis62-*