Date: Sun, 8 Dec 2019 13:02:48 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519299 - head/databases/redis-devel Message-ID: <201912081302.xB8D2mRA023550@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Sun Dec 8 13:02:48 2019 New Revision: 519299 URL: https://svnweb.freebsd.org/changeset/ports/519299 Log: Update to the recent 7e24e21 commit on Dec 5, 2019. Port to the openresty flavor of luajit. Modified: head/databases/redis-devel/Makefile head/databases/redis-devel/distinfo Modified: head/databases/redis-devel/Makefile ============================================================================== --- head/databases/redis-devel/Makefile Sun Dec 8 12:15:29 2019 (r519298) +++ head/databases/redis-devel/Makefile Sun Dec 8 13:02:48 2019 (r519299) @@ -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 Modified: head/databases/redis-devel/distinfo ============================================================================== --- head/databases/redis-devel/distinfo Sun Dec 8 12:15:29 2019 (r519298) +++ head/databases/redis-devel/distinfo Sun Dec 8 13:02:48 2019 (r519299) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912081302.xB8D2mRA023550>