From nobody Tue Nov 01 02:31:01 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N1Ysy1ZYhz4h9Ny; Tue, 1 Nov 2022 02:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N1Ysy0vbzz3db7; Tue, 1 Nov 2022 02:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667269862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J4nJ/RKOVDhwKbbcOSanC8auQ6gbPlPGsmnnCrlTSig=; b=CoOm915ppriOo42T9EtpynhgIhSMpUvcJlKDyj12nXy2EGYfWgRrLtWmkQofiOeS37lT7w RP+7v6BnRZVRldShoCZDZQ2acmdqMJCivzTL/gqXUHqGCX5Lc6Ll+pcMhiP4p1asdDigli UCfYdvIyE7ewKopYw+JC4cBFVmIoWVLP22aY2pefAMa+U5fYKNx3I5VI3PyxCfGrMsddYz KRaBYAdWjPhYN4HFGyc/msI0hAzjXeiJXNY5fu4FqPfyOmpEra9Pgt394Jmo/pSLqBPtLO 4DugNHSrVpsFj7miEHBVnrSaqTiNUUV05nbKTS/rnz7U8UPljT/P/40EnE6eBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N1Ysx73gNzyny; Tue, 1 Nov 2022 02:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A12V1Fo094737; Tue, 1 Nov 2022 02:31:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A12V1JC094736; Tue, 1 Nov 2022 02:31:01 GMT (envelope-from git) Date: Tue, 1 Nov 2022 02:31:01 GMT Message-Id: <202211010231.2A12V1JC094736@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 08083b84ab91 - main - databases/redis-devel: Update to latest snapshot List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08083b84ab913493c8f0c2d0c4b8057e2248ec8d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667269862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J4nJ/RKOVDhwKbbcOSanC8auQ6gbPlPGsmnnCrlTSig=; b=xnZVDfRGjSqPbnm6ek/5FZYwheKyS/yCvzFEn5nUMpLsoQW2BeaC8Sr8nAJsk8ceYRF4BT MEiHyf8DiF9M7XvKSGuoQzA6WvbYcqSC84PUxnbxK/mX4rx/VDoKvOHGL+t27QoW60P6mc sCK9nXIIhHIzWXp+0WJy66H9CZt2rINCsZHikVmMP4DPxQOgj6Y7osNi8xj1YIIIHdPs6f hbh8ikFlVidNuxIYj1Srlp8S9wXlnHj6dO/vEbzyoBVjPr2I/by0kDOEiB94wnl/zd9/ZR xlmJFXxeqyaMiyiKuHtAIqbbG6MsmvH4MfulRi7SsTKZ2WIWJawlFEK7iVI6kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667269862; a=rsa-sha256; cv=none; b=G8ToM5tnhh9mNkPPyagCkiSeKWdATpPFgGbOTO0Nx8XoG/xOxiU8AnPK7t/eFykrfMhKtl UaU74zcwW0XmUK+ZNd9YSyeerqRs6RliiCPc5XLxvpB94fUlERkzKWiBTYm/NacObhO9Mc XNRRZ+pKKRgiHUdRTG5a0/cRwkRA2zpGxRY907SJYCz9dYL+S4O1o37nWHVuzkP2QnFgUr xGFsiLtR7uaC4gz5uSqYpEoR+E53Ne0fGTUhcf7+6hA86+DgpPDBoCuGewhkhUfJX6CokQ gBzKFUSTA6gETi75wzp/QRbaiMlqyZN8Vi8PKt06gJ4h2TJM0uEsjcBdGS8UyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=08083b84ab913493c8f0c2d0c4b8057e2248ec8d commit 08083b84ab913493c8f0c2d0c4b8057e2248ec8d Author: Yasuhiro Kimura AuthorDate: 2022-10-31 18:59:59 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-11-01 02:26:03 +0000 databases/redis-devel: Update to latest snapshot Changes: https://github.com/redis/redis/compare/ed4c432ec...5b102e233 --- databases/redis-devel/Makefile | 4 +-- databases/redis-devel/distinfo | 6 ++-- .../redis-devel/files/extra-patch-src-Makefile.lua | 34 +++++++++++----------- .../files/extra-patch-src-Makefile.luajit | 34 +++++++++++----------- .../files/extra-patch-src-Makefile.luajit-or | 34 +++++++++++----------- 5 files changed, 56 insertions(+), 56 deletions(-) diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index 7b603d560899..834285b4060c 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= redis -DISTVERSION= 7.0.5.20220930 +DISTVERSION= 7.0.5.20221029 CATEGORIES= databases PKGNAMESUFFIX= -devel @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES+= compiler:c11 cpe gmake CPE_VENDOR= redislabs USE_GITHUB= yes -GH_TAGNAME= ed4c432ec +GH_TAGNAME= 5b102e233 MAKE_ENV= OPTIMIZATION= \ V=yo diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo index 8238747baac5..70a2e21ac158 100644 --- a/databases/redis-devel/distinfo +++ b/databases/redis-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664585795 -SHA256 (redis-redis-7.0.5.20220930-ed4c432ec_GH0.tar.gz) = b3c7801db25a856573af5649c7ff3c4bd86ae1fc68b6435024fb501ec1034045 -SIZE (redis-redis-7.0.5.20220930-ed4c432ec_GH0.tar.gz) = 3004085 +TIMESTAMP = 1667239193 +SHA256 (redis-redis-7.0.5.20221029-5b102e233_GH0.tar.gz) = 7d8915a87f647f16281724b7aeb4668b4c061fe03745f0d5ddcde02b1bf5741e +SIZE (redis-redis-7.0.5.20221029-5b102e233_GH0.tar.gz) = 3018843 diff --git a/databases/redis-devel/files/extra-patch-src-Makefile.lua b/databases/redis-devel/files/extra-patch-src-Makefile.lua index 082fc4e7af51..0d71093462d6 100644 --- a/databases/redis-devel/files/extra-patch-src-Makefile.lua +++ b/databases/redis-devel/files/extra-patch-src-Makefile.lua @@ -1,15 +1,15 @@ ---- src/Makefile.orig 2022-09-01 00:38:04 UTC +--- src/Makefile.orig 2022-10-29 23:24:12 UTC +++ src/Makefile -@@ -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 hdr_histogram -+DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram +@@ -20,7 +20,7 @@ + REDIS_CFLAGS+=-flto + REDIS_LDFLAGS+=-flto + endif +-DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram fpconv ++DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram fpconv NODEPS:=clean distclean # Default settings -@@ -115,8 +115,8 @@ +@@ -119,8 +119,8 @@ # Override default settings if possible -include .make-settings @@ -18,18 +18,18 @@ +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) +FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG) FINAL_LIBS=-lm + DEBUG=-g -ggdb - # Linux ARM32 needs -latomic at linking time -@@ -227,7 +227,7 @@ +@@ -229,7 +229,7 @@ endif # Include paths to dependencies --FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram -+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram +-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram -I../deps/fpconv ++FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram -I../deps/fpconv # Determine systemd support and/or build preference (defaulting to auto-detection) BUILD_WITH_SYSTEMD=no -@@ -318,6 +318,9 @@ +@@ -320,6 +320,9 @@ endef endif @@ -39,7 +39,7 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -339,6 +342,7 @@ +@@ -341,6 +344,7 @@ REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX) REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX) 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 eval.o bio.o rio.o rand.o memtest.o syscheck.o crcspeed.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 lolwut6.o acl.o tracking.o socket.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.o strl.o connection.o unix.o @@ -47,12 +47,12 @@ REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX) REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o redisassert.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX) -@@ -393,7 +397,7 @@ +@@ -395,7 +399,7 @@ # redis-server $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) -- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) -+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) +- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a ../deps/hdr_histogram/libhdrhistogram.a ../deps/fpconv/libfpconv.a $(FINAL_LIBS) ++ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/hdr_histogram/libhdrhistogram.a ../deps/fpconv/libfpconv.a $(FINAL_LIBS) # redis-sentinel $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) diff --git a/databases/redis-devel/files/extra-patch-src-Makefile.luajit b/databases/redis-devel/files/extra-patch-src-Makefile.luajit index a7b8e4d99ebb..db2e9962a203 100644 --- a/databases/redis-devel/files/extra-patch-src-Makefile.luajit +++ b/databases/redis-devel/files/extra-patch-src-Makefile.luajit @@ -1,15 +1,15 @@ ---- src/Makefile.orig 2022-09-01 00:38:04 UTC +--- src/Makefile.orig 2022-10-29 23:24:12 UTC +++ src/Makefile -@@ -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 hdr_histogram -+DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram +@@ -20,7 +20,7 @@ + REDIS_CFLAGS+=-flto + REDIS_LDFLAGS+=-flto + endif +-DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram fpconv ++DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram fpconv NODEPS:=clean distclean # Default settings -@@ -115,8 +115,8 @@ +@@ -119,8 +119,8 @@ # Override default settings if possible -include .make-settings @@ -18,18 +18,18 @@ +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) +FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG) FINAL_LIBS=-lm + DEBUG=-g -ggdb - # Linux ARM32 needs -latomic at linking time -@@ -227,7 +227,7 @@ +@@ -229,7 +229,7 @@ endif # Include paths to dependencies --FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram -+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram +-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram -I../deps/fpconv ++FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram -I../deps/fpconv # Determine systemd support and/or build preference (defaulting to auto-detection) BUILD_WITH_SYSTEMD=no -@@ -318,6 +318,9 @@ +@@ -320,6 +320,9 @@ endef endif @@ -39,7 +39,7 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -339,6 +342,7 @@ +@@ -341,6 +344,7 @@ REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX) REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX) 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 eval.o bio.o rio.o rand.o memtest.o syscheck.o crcspeed.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 lolwut6.o acl.o tracking.o socket.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.o strl.o connection.o unix.o @@ -47,12 +47,12 @@ REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX) REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o redisassert.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX) -@@ -393,7 +397,7 @@ +@@ -395,7 +399,7 @@ # redis-server $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) -- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) -+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) +- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a ../deps/hdr_histogram/libhdrhistogram.a ../deps/fpconv/libfpconv.a $(FINAL_LIBS) ++ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/hdr_histogram/libhdrhistogram.a ../deps/fpconv/libfpconv.a $(FINAL_LIBS) # redis-sentinel $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) diff --git a/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or b/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or index c35e83ccd3d6..f7559bc6d6a8 100644 --- a/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or +++ b/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or @@ -1,15 +1,15 @@ ---- src/Makefile.orig 2022-09-01 00:38:04 UTC +--- src/Makefile.orig 2022-10-29 23:24:12 UTC +++ src/Makefile -@@ -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 hdr_histogram -+DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram +@@ -20,7 +20,7 @@ + REDIS_CFLAGS+=-flto + REDIS_LDFLAGS+=-flto + endif +-DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram fpconv ++DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram fpconv NODEPS:=clean distclean # Default settings -@@ -115,8 +115,8 @@ +@@ -119,8 +119,8 @@ # Override default settings if possible -include .make-settings @@ -18,18 +18,18 @@ +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) +FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG) FINAL_LIBS=-lm + DEBUG=-g -ggdb - # Linux ARM32 needs -latomic at linking time -@@ -227,7 +227,7 @@ +@@ -229,7 +229,7 @@ endif # Include paths to dependencies --FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram -+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram +-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram -I../deps/fpconv ++FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram -I../deps/fpconv # Determine systemd support and/or build preference (defaulting to auto-detection) BUILD_WITH_SYSTEMD=no -@@ -318,6 +318,9 @@ +@@ -320,6 +320,9 @@ endef endif @@ -39,7 +39,7 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -339,6 +342,7 @@ +@@ -341,6 +344,7 @@ REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX) REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX) 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 eval.o bio.o rio.o rand.o memtest.o syscheck.o crcspeed.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 lolwut6.o acl.o tracking.o socket.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.o strl.o connection.o unix.o @@ -47,12 +47,12 @@ REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX) REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o redisassert.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX) -@@ -393,7 +397,7 @@ +@@ -395,7 +399,7 @@ # redis-server $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) -- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) -+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) +- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a ../deps/hdr_histogram/libhdrhistogram.a ../deps/fpconv/libfpconv.a $(FINAL_LIBS) ++ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/hdr_histogram/libhdrhistogram.a ../deps/fpconv/libfpconv.a $(FINAL_LIBS) # redis-sentinel $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)