diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2022-10-15 11:40:23 -0600 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2022-10-15 11:40:23 -0600 |
| commit | 5d5a9994274bdc4fecd88188b9b75bf829e7e3a4 (patch) | |
| tree | 41644255f8ee17884651151331646fe4591eaafa /databases/redis-devel | |
| parent | sysutils/nvimpager: Update to 0.11.0 (diff) | |
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.
Diffstat (limited to 'databases/redis-devel')
| -rw-r--r-- | databases/redis-devel/Makefile | 26 |
1 files changed, 13 insertions, 13 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-* |