git: 4f385871cbf9 - main - databases/redis{,62,-devel}: Amend previous commit
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 15 Oct 2022 17:52:42 UTC
The branch main has been updated by adamw:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4f385871cbf90a525fdd38f075f7b3a27155ac3b
commit 4f385871cbf90a525fdd38f075f7b3a27155ac3b
Author: Adam Weinberger <adamw@FreeBSD.org>
AuthorDate: 2022-10-15 17:51:37 +0000
Commit: Adam Weinberger <adamw@FreeBSD.org>
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