Date: Thu, 12 Dec 2019 00:57:25 +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: r519852 - in head/databases/redis: . files Message-ID: <201912120057.xBC0vPRc039375@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Thu Dec 12 00:57:24 2019 New Revision: 519852 URL: https://svnweb.freebsd.org/changeset/ports/519852 Log: Merge the following changes from databases/redis-devel: o) respect [C|CXX]FLAGS o) support the openresty's flavor of luajit Bump PORTREVISION. Added: head/databases/redis/files/extra-patch-deps_lua_src_lua__cjson.c (contents, props changed) head/databases/redis/files/extra-patch-src-Makefile.luajit-or (contents, props changed) head/databases/redis/files/patch-deps_Makefile (contents, props changed) Modified: head/databases/redis/Makefile Modified: head/databases/redis/Makefile ============================================================================== --- head/databases/redis/Makefile Thu Dec 12 00:39:05 2019 (r519851) +++ head/databases/redis/Makefile Thu Dec 12 00:57:24 2019 (r519852) @@ -3,7 +3,7 @@ PORTNAME= redis PORTVERSION= 5.0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= http://download.redis.io/releases/ @@ -14,11 +14,12 @@ LICENSE= BSD3CLAUSE 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-openjit instead of builtin lua TESTS_DESC= Install lang/tcl for redis unit tests TRIB_DESC= Install redis-trib.rb (lang/ruby req.) @@ -53,7 +54,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 @@ -96,7 +103,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 .if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42 Added: head/databases/redis/files/extra-patch-deps_lua_src_lua__cjson.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/redis/files/extra-patch-deps_lua_src_lua__cjson.c Thu Dec 12 00:57:24 2019 (r519852) @@ -0,0 +1,11 @@ +--- deps/lua/src/lua_cjson.c.orig 2019-12-08 07:56:31.419672000 -0500 ++++ deps/lua/src/lua_cjson.c 2019-12-08 07:56:52.389362000 -0500 +@@ -1299,7 +1299,7 @@ + * + * luaL_setfuncs() is used to create a module table where the functions have + * json_config_t as their first upvalue. Code borrowed from Lua 5.2 source. */ +-static void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup) ++void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup) + { + int i; + Added: head/databases/redis/files/extra-patch-src-Makefile.luajit-or ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/redis/files/extra-patch-src-Makefile.luajit-or Thu Dec 12 00:57:24 2019 (r519852) @@ -0,0 +1,58 @@ +--- src/Makefile.orig 2019-11-19 12:05:52.000000000 -0500 ++++ src/Makefile 2019-12-11 19:44:38.238797000 -0500 +@@ -16,7 +16,7 @@ + uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') + uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') + OPTIMIZATION?=-O2 +-DEPENDENCY_TARGETS=hiredis linenoise lua ++DEPENDENCY_TARGETS=hiredis linenoise + NODEPS:=clean distclean + + # Default settings +@@ -72,8 +72,8 @@ + # Override default settings if possible + -include .make-settings + +-FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) +-FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) ++FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) ++FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG) + FINAL_LIBS=-lm + DEBUG=-g -ggdb + +@@ -127,7 +127,7 @@ + endif + endif + # Include paths to dependencies +-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src ++FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise + + ifeq ($(MALLOC),tcmalloc) + FINAL_CFLAGS+= -DUSE_TCMALLOC +@@ -145,6 +145,9 @@ + FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS) + endif + ++FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1 ++FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1 ++ + REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) + REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) + REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) +@@ -165,6 +168,7 @@ + REDIS_SERVER_NAME=redis-server + REDIS_SENTINEL_NAME=redis-sentinel + REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o ++REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o + REDIS_CLI_NAME=redis-cli + REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o + REDIS_BENCHMARK_NAME=redis-benchmark +@@ -216,7 +220,7 @@ + + # redis-server + $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) +- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS) ++ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) + + # redis-sentinel + $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) Added: head/databases/redis/files/patch-deps_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/redis/files/patch-deps_Makefile Thu Dec 12 00:57:24 2019 (r519852) @@ -0,0 +1,18 @@ +--- deps/Makefile.orig 2019-11-29 16:35:59 UTC ++++ deps/Makefile +@@ -76,12 +76,12 @@ lua: .make-prerequisites + + .PHONY: lua + +-JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS) ++JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -funroll-loops $(CFLAGS) + JEMALLOC_LDFLAGS= $(LDFLAGS) + + jemalloc: .make-prerequisites + @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) +- cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" +- cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a ++ cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" ++ cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a + + .PHONY: jemalloc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912120057.xBC0vPRc039375>