Date: Sat, 15 Oct 2022 17:41:33 GMT
From: Adam Weinberger <adamw@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject: git: 5d5a9994274b - main - databases/redis{,62,-devel}: Use USES=luajit (defaults to lang/luajit-devel)
Message-ID: <202210151741.29FHfXsK069790@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d5a9994274bdc4fecd88188b9b75bf829e7e3a4 commit 5d5a9994274bdc4fecd88188b9b75bf829e7e3a4 Author: Adam Weinberger <adamw@FreeBSD.org> AuthorDate: 2022-10-15 17:40:23 +0000 Commit: Adam Weinberger <adamw@FreeBSD.org> 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-*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210151741.29FHfXsK069790>