From nobody Sat Oct 15 17:52:42 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 4MqW7G6xHBz4fNJj; Sat, 15 Oct 2022 17:52:42 +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 4MqW7G6Wxnz42CJ; Sat, 15 Oct 2022 17:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665856362; 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=U2/iEqXdabTgbzg1VpTMC6RdjAzAGp960X/BLfe4D4E=; b=YXTTisceB2/4Tf1G1tq4ZovW1Ze5Gu62OdLmxfRkWRWc4jyUVTvR6jkuZoXgt0ogA9lpgY NzAf78yCM7dr7/juwS58Ca5DDPQdCG4c1pNtS8KfkjSdQAotGScMI+JYGPQdfgr59M6ebk VLv7zthxxwpr+9ZrwsoQMPZ+SfTuhf6WJavKD/xNIkLOzh5IJZuUO6Aa2aNTQaHFNptrjv QfOTjp34Co9cDnTK7koArkxKQjpeNbKICrpFqujlkk5eN3QHKUJmmixEAGp+wOioKSMy+w qzfcjsVb8WpQGotazlqDXwuqGISTnrdLSDiVM7QOzWlsSnLhZi0Ifir2cxuXCA== 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 4MqW7G5b5Bz1BgM; Sat, 15 Oct 2022 17:52:42 +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 29FHqg68085030; Sat, 15 Oct 2022 17:52:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29FHqgke085029; Sat, 15 Oct 2022 17:52:42 GMT (envelope-from git) Date: Sat, 15 Oct 2022 17:52:42 GMT Message-Id: <202210151752.29FHqgke085029@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: 4f385871cbf9 - main - databases/redis{,62,-devel}: Amend previous commit 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: 4f385871cbf90a525fdd38f075f7b3a27155ac3b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665856362; 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=U2/iEqXdabTgbzg1VpTMC6RdjAzAGp960X/BLfe4D4E=; b=vzpj3ugKBVgiS7e00gRFS12VLwyGxiaRKcJkUM5qQdq0NHF3Kvo84sMLYr7UqXxIb3kKn0 adQHn9IbULnlvsOjNrRyIDjfi+d0WF9q5iXEirx9V3NHJ5fArKwMhm0Adcj8CvoCHHxjaz npGZI1bPGlKWip8e2YZqjnKTLONHwaOHISA1kcWFbkxEgz1zBoNPLSlQIEr2ee5RC99qzL AsL+K3arRV1CzW6D8pefLd8ckvNEXWzOxLwmF8KAE39Q45hmiaOs3qi+SumJhUy7PIjLIy fggWPTNME2gGHuS59djULvgRsbiBuA8isnzX8VGGuSxYbPwaKc3r6im2vEv7uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665856362; a=rsa-sha256; cv=none; b=hxkW9ALVMOG1pgioiYjMjtQNPqWrOmJpu0GBL80x8ZAqaJZl3vWvUcepjd9/PUx7BH1mYM 0eBuIRII/umoBA0rIfjIyygV8WdfRrjMBI8KexC1gRZc1Qa6LD3gM6rWxvYZyx36HeEqYd Eek6LW23PgYFvaDRgLPzVILuJIvgNDGzUO5tmTgE58b2T4+b3k932+rsYfItcaYNwIwFlM tgSUSpQVT6gtByrkNmkQlzPIqHjmfk+D7+AeI4B9IKxg+TLyw+GwgCIl1zgPGn6rUcJ0yd 6g9B1h+AGwgQ1hJToUhnRD5Oc0/Lp8jJTEDbvAhpMGQP1AeCIHWw7XgZgpM8Wg== 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=4f385871cbf90a525fdd38f075f7b3a27155ac3b commit 4f385871cbf90a525fdd38f075f7b3a27155ac3b Author: Adam Weinberger AuthorDate: 2022-10-15 17:51:37 +0000 Commit: Adam Weinberger CommitDate: 2022-10-15 17:52:15 +0000 databases/redis{,62,-devel}: Amend previous commit The openresty patches work for luajit-devel, though redis is still broken with luajit enabled. --- databases/redis-devel/Makefile | 6 +++--- databases/redis/Makefile | 6 +++--- databases/redis62/Makefile | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index aaad66cd0ab8..7b603d560899 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -64,12 +64,12 @@ LDFLAGS+= -Wl,-E .endif .if ${PORT_OPTIONS:MLUAJIT} -. if ${LUAJIT_VER} == luajit-openresty +. 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-src-function_lua.c \ ${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c -. else -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit . endif . endif diff --git a/databases/redis/Makefile b/databases/redis/Makefile index 1ca005550206..721fb46b00b3 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -59,12 +59,12 @@ LDFLAGS+= -Wl,-E .endif .if ${PORT_OPTIONS:MLUAJIT} -. if ${LUAJIT_VER} == luajit-openresty +. 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-src-function_lua.c \ ${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c -. else -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit . endif .endif diff --git a/databases/redis62/Makefile b/databases/redis62/Makefile index 00f2760f708c..0dc8f8473474 100644 --- a/databases/redis62/Makefile +++ b/databases/redis62/Makefile @@ -61,11 +61,11 @@ LDFLAGS+= -Wl,-E .endif .if ${PORT_OPTIONS:MLUAJIT} -. if ${LUAJIT_VER} == luajit-openresty +. 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 -. else -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit . endif .endif