From nobody Sat Oct 15 17:41:33 2022 X-Original-To: dev-commits-ports-all@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 4MqVtP3kSBz4fLt6; Sat, 15 Oct 2022 17:41:33 +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 4MqVtP3HB3z41SK; Sat, 15 Oct 2022 17:41:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665855693; 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=qA8vfM9TIGmTq65D8wtGFkZS8092IpIz+XyP99HMUFo=; b=DsP/BWGOPddFBwDJU5HVb+H9/x3fQmFE2yxSQiDC8SirFgDDwnD123FKukvGfZ3Q6aaA2m tJ42s0FzvTqOTD2W4ivEp+JW6Eh8Fs+d2QcU5rGCxK7JmfHhPvbRxRwL+v95He2pTYJ2DH FwGa/iYmmeD06m26Kcbm79Pa8FXUVxxaB361OcaAsuINbE4N8trHLtRThA5TnSy0lX7cxf F+RQpkSTMRn5gpqWq4utUgyjKPNVm9xQEMPv/3G8rA8pDhTIIz3dUQOkIFfSRZjEp/2l3i 592diaC4U630X8RNW7PJhana8m0tDNTEhoZb8c2ElaXa8nl6rYt8hhqzNjPPdw== 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 4MqVtP2Kr3z1BHx; Sat, 15 Oct 2022 17:41:33 +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 29FHfXUU069791; Sat, 15 Oct 2022 17:41:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29FHfXsK069790; Sat, 15 Oct 2022 17:41:33 GMT (envelope-from git) Date: Sat, 15 Oct 2022 17:41:33 GMT Message-Id: <202210151741.29FHfXsK069790@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: 5d5a9994274b - main - databases/redis{,62,-devel}: Use USES=luajit (defaults to lang/luajit-devel) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 5d5a9994274bdc4fecd88188b9b75bf829e7e3a4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665855693; 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=qA8vfM9TIGmTq65D8wtGFkZS8092IpIz+XyP99HMUFo=; b=HU57TINqys/b4ivZmT078r95kuUD+62O3O7krOw3gFnGG4jwoG9odN831cWR0eDMFWoHUG S3sCNRIFtI7PehRZAErLlPUTThuW1uk9AY682u6drZcSG8I7LAZ4Xg/TnAasS3ibqxzpch WP9KQd4aAXNiF9Tyy2YdWpMcHODs7Rv2ken8kZaEVDZZE3o+zIYg/1zyPAcPRDvKwtDKw9 WBui8Azi1ReWuzoJS6mPWNKaRiKaCsz2XdKW9TPqp3VwkxfYExzF8aN3jFFxO4Q3qccEyV eBH6wTDxhHqP00ftDpcy4/2b/Dmcs/Wvxz61KBayhs9fM2kFEaQoNkRssTX6HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665855693; a=rsa-sha256; cv=none; b=WhE2pNpkihz0JcZFEEzrOaw///B3U6q1Nh4xUgQ8+3nar/bhNMS6feongW8RmOugjDTg7E EHygdBAStvoyRZNLN7oa31MNkC+AFJqJXUu1zaZVfFoPvmuXcYuLwjOEGktmUP9QIF7o1S GpHaqpEpU1EzExAZyXbMpbTMFh0BRWaKOXOaE+w4NZ/6vweqimm9KMF54NJElLRVCyR96d U2jWXhcVCmnFbRzEdmHuwCZwIgrbWKbSBjU7fEyGrYyJrmN2kfWzL/2YpJ2WqJLikIdJ+J 0v1a0IxfuN1yayoEbs28H/SLtJPWpqndWubRH3uMjHqnOJg7GRrg1dPSSh4BXg== 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=5d5a9994274bdc4fecd88188b9b75bf829e7e3a4 commit 5d5a9994274bdc4fecd88188b9b75bf829e7e3a4 Author: Adam Weinberger AuthorDate: 2022-10-15 17:40:23 +0000 Commit: Adam Weinberger CommitDate: 2022-10-15 17:40:23 +0000 databases/redis{,62,-devel}: Use USES=luajit (defaults to lang/luajit-devel) The LUAJIT option is marked broken in all these ports, so no PORTREVISION bump. --- databases/redis-devel/Makefile | 26 +++++++++++++------------- databases/redis/Makefile | 26 +++++++++++++------------- databases/redis62/Makefile | 24 ++++++++++++------------ 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index 82ce23fa1341..aaad66cd0ab8 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -25,29 +25,19 @@ PORTSCOUT= ignore:1 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_BROKEN= Fails to link -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-src-function_lua.c \ - ${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c -LUAJITOR_VARS= _ADDFLAGS=true LUAJIT_BROKEN= Fails to link -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_BROKEN= Fails to link LUA_USES= lua:51 @@ -73,6 +63,16 @@ CFLAGS+= -fPIC LDFLAGS+= -Wl,-E .endif +.if ${PORT_OPTIONS:MLUAJIT} +. if ${LUAJIT_VER} == luajit-openresty +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ + ${PATCHDIR}/extra-patch-src-function_lua.c \ + ${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c +. else +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit +. endif +. endif + LDFLAGS+= -lpthread -lm -lexecinfo CONFLICTS?= redis-[1-9].* redis6-* redis62-* diff --git a/databases/redis/Makefile b/databases/redis/Makefile index f0cb328b7f16..1ca005550206 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -19,30 +19,20 @@ CONFLICTS_INSTALL= redis-devel redis6 # etc/rc.d/redis OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB OPTIONS_RADIO= EXTLUA -OPTIONS_RADIO_EXTLUA= LUA LUAJIT LUAJITOR +OPTIONS_RADIO_EXTLUA= LUA LUAJIT OPTIONS_SUB= yes OPTIONS_DEFAULT+= TLS 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_BROKEN= Fails to link -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-src-function_lua.c \ - ${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c -LUAJITOR_VARS= _ADDFLAGS=true LUAJIT_BROKEN= Fails to link -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_BROKEN= Fails to link LUA_USES= lua:51 @@ -68,6 +58,16 @@ CFLAGS+= -fPIC LDFLAGS+= -Wl,-E .endif +.if ${PORT_OPTIONS:MLUAJIT} +. if ${LUAJIT_VER} == luajit-openresty +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ + ${PATCHDIR}/extra-patch-src-function_lua.c \ + ${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c +. else +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit +. endif +.endif + LDFLAGS+= -lpthread -lm -lexecinfo CONFLICTS?= redis-devel-* redis6-* redis62-* diff --git a/databases/redis62/Makefile b/databases/redis62/Makefile index a4d36fa6409b..00f2760f708c 100644 --- a/databases/redis62/Makefile +++ b/databases/redis62/Makefile @@ -22,28 +22,19 @@ MAKE_ENV= OPTIMIZATION= \ 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_BROKEN= Fails to link -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_BROKEN= Fails to link -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_BROKEN= Fails to link LUA_USES= lua:51 @@ -69,6 +60,15 @@ CFLAGS+= -fPIC LDFLAGS+= -Wl,-E .endif +.if ${PORT_OPTIONS:MLUAJIT} +. if ${LUAJIT_VER} == luajit-openresty +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ + ${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c +. else +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit +. endif +.endif + LDFLAGS+= -lpthread -lm -lexecinfo CONFLICTS?= redis-[1-9].* redis-devel-* redis6-*