From nobody Mon Jan 31 22:29:27 2022 X-Original-To: dev-commits-ports-main@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 71D8A19A6119; Mon, 31 Jan 2022 22:29:27 +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 4JnjRC2kZdz4fSx; Mon, 31 Jan 2022 22:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643668167; 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=Jm8+Rl1J6YdLqNbavEkpUNmTUcbW93BXopGVmtd2ajI=; b=a7ajHOuFJKMIhZoOP4uWeMPzdq0LJcnv040R80+brqRa0W4HlTB3LdlT0XTpPw5tdIl45w U7RXTJi++Qv69IEEM8P3116vHozj7XjbwjCxYF0oIBEGcyT426Puz4mQX4wbXjM2PWAMTk hZ0fucM7rK3jvfqNbveER9mn0//vvANYw13YW8l64l42up9MuP3OFmuLtcSKjbyonIxE37 PHT2WdlpLGqa9HIlET/qqd7AsBYc+GLUIaYME1gvp76muM5ShpqvhZrtNLDGNt6wYvGXRY +RAPAPV4AvTHDnLJTxmQ1mECF/GB7gugHB7gC+FjFYv3AvAWQ6r7NRyHq63IJw== 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 3D634248B3; Mon, 31 Jan 2022 22:29:27 +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 20VMTRHk086191; Mon, 31 Jan 2022 22:29:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20VMTRHH086190; Mon, 31 Jan 2022 22:29:27 GMT (envelope-from git) Date: Mon, 31 Jan 2022 22:29:27 GMT Message-Id: <202201312229.20VMTRHH086190@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: 78ffce71dc93 - main - databases/redis-devel: Update to latest snapshot List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 78ffce71dc93e5d41970909609a49897c4a96e54 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643668167; 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=Jm8+Rl1J6YdLqNbavEkpUNmTUcbW93BXopGVmtd2ajI=; b=cC3JlvYKtShHc+RHdK2XcryR5ZT7dPlmdOc4I64u2SD7EkNcgN6jwoIIPkCECLWifTGsHL OAbNtwcUcN0ri8mtoUHmldWtaclPkxIySFgegy2hpHn9MuBTjLXEen76dcd9WSxz242oGd 79LUR70jDehftwlQSgpFFxnKkFGUlmWZIexXtV5gyJtUIjhCXJQH4bqJgI+tiPan5gPgK6 k0HDBNmEmFMoPxkBPdNYi4z3T+SZ0JWUcDE/9Ewf8oqoOS6I3LCKmyzwZyOnCYO+/riENo ouzzmi3VmYc4JKSAnMH1hsEH80fYTBdhYrP+tCP2BqwhaHLhvV5xo86wfU+p2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643668167; a=rsa-sha256; cv=none; b=etbME424iHCSJIC+0QFiNSvTuXVRtSWpqK5nH4qgB8BgPD4djhYO+kgm4ciZL4X6trBPa8 WYLtSpHP21pNj6nPvLBRqx0wPyTH33h0VlfFjUQ4ef3ZphW8WYeMpyxNqX8C406n/Jy3D9 cU2XBsnp1U/BaMZWiyCzkuHMhiPHFAWVNs4GFjZ/dera4kd7strK8YCGzoZRn0hOCoHEe/ HER74O1OHeVsX7YJ2Ob/1ZqkfmgCyr0/AbFwjG6p9avXA1opT7FrFrYxNpXKz3GmYrLHoQ BM9Ju2cdi2vpzSMgLWXV45sazm+mwEcXMwawpPLMR5wPpmLEMntAuEqZzdVp0g== 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=78ffce71dc93e5d41970909609a49897c4a96e54 commit 78ffce71dc93e5d41970909609a49897c4a96e54 Author: Yasuhiro Kimura AuthorDate: 2022-01-31 20:35:24 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-01-31 22:28:57 +0000 databases/redis-devel: Update to latest snapshot Changes: https://github.com/redis/redis/commits/6ca97da --- databases/redis-devel/Makefile | 5 ++-- databases/redis-devel/distinfo | 6 ++--- .../redis-devel/files/extra-patch-src-Makefile.lua | 28 +++++++++++----------- .../files/extra-patch-src-Makefile.luajit | 28 +++++++++++----------- .../files/extra-patch-src-Makefile.luajit-or | 28 +++++++++++----------- .../files/extra-patch-src-function_lua.c | 13 ++++++++++ 6 files changed, 61 insertions(+), 47 deletions(-) diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index 796092868283..53653ba6fb6d 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -1,7 +1,7 @@ # Created by: Sergey Skvortsov PORTNAME= redis -PORTVERSION= 7.0.0.20211201 +PORTVERSION= 7.0.0.20220131 CATEGORIES= databases PKGNAMESUFFIX= -devel @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES+= compiler:c11 cpe gmake CPE_VENDOR= redislabs USE_GITHUB= yes -GH_TUPLE= redis:redis:0e5b813 +GH_TUPLE= redis:redis:6ca97da OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB OPTIONS_RADIO= EXTLUA @@ -44,6 +44,7 @@ LUAJIT_VARS= _addflags=true LUAJITOR_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty LUAJITOR_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.1/lua.h: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 diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo index 839c96e2cf29..88b48dadb6ed 100644 --- a/databases/redis-devel/distinfo +++ b/databases/redis-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1638371049 -SHA256 (redis-redis-7.0.0.20211201-0e5b813_GH0.tar.gz) = b73a062ce2c4945a935792bcfa198e90f04df4e7d7a82a19001aad6f3010459a -SIZE (redis-redis-7.0.0.20211201-0e5b813_GH0.tar.gz) = 2677658 +TIMESTAMP = 1643657761 +SHA256 (redis-redis-7.0.0.20220131-6ca97da_GH0.tar.gz) = df91b39beeed64fd65abf199a0a5c40b18609616c8c52806f0d964ba80ba920e +SIZE (redis-redis-7.0.0.20220131-6ca97da_GH0.tar.gz) = 2874928 diff --git a/databases/redis-devel/files/extra-patch-src-Makefile.lua b/databases/redis-devel/files/extra-patch-src-Makefile.lua index 25b57390aea4..8012dc4d76e6 100644 --- a/databases/redis-devel/files/extra-patch-src-Makefile.lua +++ b/databases/redis-devel/files/extra-patch-src-Makefile.lua @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2021-01-12 09:21:03.000000000 -0500 -+++ src/Makefile 2021-01-13 11:52:33.070529000 -0500 +--- src/Makefile.orig 2022-01-12 01:00:14.676138000 +0900 ++++ src/Makefile 2022-01-12 01:05:07.007928000 +0900 @@ -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') @@ -9,7 +9,7 @@ NODEPS:=clean distclean # Default settings -@@ -83,8 +83,8 @@ +@@ -115,8 +115,8 @@ # Override default settings if possible -include .make-settings @@ -18,19 +18,19 @@ +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) +FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG) FINAL_LIBS=-lm - DEBUG=-g -ggdb -@@ -188,7 +188,7 @@ - endif + # Linux ARM32 needs -latomic at linking time +@@ -227,7 +227,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 # Determine systemd support and/or build preference (defaulting to auto-detection) BUILD_WITH_SYSTEMD=no -@@ -251,6 +251,9 @@ - FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS) +@@ -301,6 +301,9 @@ + endef endif +FINAL_CFLAGS+=-I${PREFIX}/include/lua51 @@ -39,20 +39,20 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -271,6 +274,7 @@ +@@ -322,6 +325,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 scripting.o bio.o rio.o rand.o memtest.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 connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o + 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 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 connection.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 +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o 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 crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o + 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 REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX) -@@ -324,7 +328,7 @@ +@@ -375,7 +379,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_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-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 b9affc3fabd1..95727c600cb8 100644 --- a/databases/redis-devel/files/extra-patch-src-Makefile.luajit +++ b/databases/redis-devel/files/extra-patch-src-Makefile.luajit @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2021-01-12 09:21:03.000000000 -0500 -+++ src/Makefile 2021-01-13 12:25:07.823451000 -0500 +--- src/Makefile.orig 2022-01-12 01:09:20.385180000 +0900 ++++ src/Makefile 2022-01-12 01:11:45.772845000 +0900 @@ -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') @@ -9,7 +9,7 @@ NODEPS:=clean distclean # Default settings -@@ -83,8 +83,8 @@ +@@ -115,8 +115,8 @@ # Override default settings if possible -include .make-settings @@ -18,19 +18,19 @@ +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) +FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG) FINAL_LIBS=-lm - DEBUG=-g -ggdb -@@ -188,7 +188,7 @@ - endif + # Linux ARM32 needs -latomic at linking time +@@ -227,7 +227,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 # Determine systemd support and/or build preference (defaulting to auto-detection) BUILD_WITH_SYSTEMD=no -@@ -251,6 +251,9 @@ - FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS) +@@ -301,6 +301,9 @@ + endef endif +FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0 @@ -39,20 +39,20 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -271,6 +274,7 @@ +@@ -322,6 +325,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 scripting.o bio.o rio.o rand.o memtest.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 connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o + 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 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 connection.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 +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o 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 crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o + 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 REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX) -@@ -324,7 +328,7 @@ +@@ -375,7 +379,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_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-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 8e18d4bf3088..ab2aba5bbf68 100644 --- a/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or +++ b/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2021-01-12 09:21:03.000000000 -0500 -+++ src/Makefile 2021-01-13 12:27:19.444193000 -0500 +--- src/Makefile.orig 2022-01-12 01:14:34.800218000 +0900 ++++ src/Makefile 2022-01-12 01:16:26.274158000 +0900 @@ -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') @@ -9,7 +9,7 @@ NODEPS:=clean distclean # Default settings -@@ -83,8 +83,8 @@ +@@ -115,8 +115,8 @@ # Override default settings if possible -include .make-settings @@ -18,19 +18,19 @@ +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) +FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG) FINAL_LIBS=-lm - DEBUG=-g -ggdb -@@ -188,7 +188,7 @@ - endif + # Linux ARM32 needs -latomic at linking time +@@ -227,7 +227,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 # Determine systemd support and/or build preference (defaulting to auto-detection) BUILD_WITH_SYSTEMD=no -@@ -251,6 +251,9 @@ - FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS) +@@ -301,6 +301,9 @@ + endef endif +FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1 @@ -39,20 +39,20 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -271,6 +274,7 @@ +@@ -322,6 +325,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 scripting.o bio.o rio.o rand.o memtest.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 connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o + 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 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 connection.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 +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o 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 crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o + 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 REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX) -@@ -324,7 +328,7 @@ +@@ -375,7 +379,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_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-sentinel $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) diff --git a/databases/redis-devel/files/extra-patch-src-function_lua.c b/databases/redis-devel/files/extra-patch-src-function_lua.c new file mode 100644 index 000000000000..6e4fc624de52 --- /dev/null +++ b/databases/redis-devel/files/extra-patch-src-function_lua.c @@ -0,0 +1,13 @@ +--- src/function_lua.c.orig 2022-01-31 19:49:57.000000000 +0900 ++++ src/function_lua.c 2022-02-01 05:03:43.442197000 +0900 +@@ -52,6 +52,10 @@ + #define LIBRARY_API_NAME "__LIBRARY_API__" + #define LOAD_TIMEOUT_MS 500 + ++#ifndef lua_unref ++#define lua_unref(L,ref) luaL_unref(L, LUA_REGISTRYINDEX, (ref)) ++#endif ++ + /* Lua engine ctx */ + typedef struct luaEngineCtx { + lua_State *lua;