Update to the recent 7e24e21 commit on Dec 5, 2019.

Port to the openresty flavor of luajit.
This commit is contained in:
Sergey A. Osokin 2019-12-08 13:02:48 +00:00
parent 94108af78b
commit f7f8a8ebd2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=519299
2 changed files with 15 additions and 8 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= redis
PORTVERSION= 6.0.0.20191203
PORTVERSION= 6.0.0.20191205
CATEGORIES= databases
PKGNAMESUFFIX= -devel
@ -13,15 +13,16 @@ LICENSE= BSD3CLAUSE
USES+= compiler:c11 gmake
USE_GITHUB= yes
GH_TUPLE= antirez:${PORTNAME}:7b5f4b1
GH_TUPLE= antirez:${PORTNAME}:7e24e21
OPTIONS_DEFINE= JEMALLOC TESTS TRIB
OPTIONS_RADIO= EXTLUA
OPTIONS_RADIO_EXTLUA= LUA LUAJIT
OPTIONS_RADIO_EXTLUA= LUA LUAJIT LUAJITOR
OPTIONS_SUB= yes
JEMALLOC_DESC= Use jemalloc
LUA_DESC= Use lang/lua instead of builtin lua
LUAJIT_DESC= Use lang/luajit instead of builtin lua
LUAJITOR_DESC= Use lang/luajit-openresty instead of builtin lua
TESTS_DESC= Install lang/tcl for redis unit tests
TRIB_DESC= Install redis-trib.rb (lang/ruby req.)
@ -55,7 +56,13 @@ LIB_DEPENDS+= libluajit-5.1.so:lang/luajit
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.luajit
.endif
.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT}
.if ${PORT_OPTIONS:MLUAJITOR}
LIB_DEPENDS+= libluajit-5.1.so:lang/luajit-openresty
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \
${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c
.endif
.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUAJITOR}
CFLAGS+= -fPIC
LDFLAGS+= -Wl,-E
.endif
@ -98,7 +105,7 @@ post-patch:
.if ${PORT_OPTIONS:MJEMALLOC}
@${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
.endif
.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT}
.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUAJITOR}
@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/
.endif

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1575507634
SHA256 (antirez-redis-6.0.0.20191203-7b5f4b1_GH0.tar.gz) = d9d76066f0664453db3a4d2b4e349808d0ba5777ed5e58406ca2537d64c7bdf3
SIZE (antirez-redis-6.0.0.20191203-7b5f4b1_GH0.tar.gz) = 2162083
TIMESTAMP = 1575809952
SHA256 (antirez-redis-6.0.0.20191205-7e24e21_GH0.tar.gz) = 95b95b11f384b2a2ab26e6d64f3aabfe6e1f810f2baddc2b1b8d3c4edf4239be
SIZE (antirez-redis-6.0.0.20191205-7e24e21_GH0.tar.gz) = 2162089