Date: Wed, 13 Jan 2021 17:31:23 +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: r561490 - in head/databases/redis-devel: . files Message-ID: <202101131731.10DHVNwV057304@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Wed Jan 13 17:31:22 2021 New Revision: 561490 URL: https://svnweb.freebsd.org/changeset/ports/561490 Log: Update to the recent development version 6.2.0rc2. Modified: head/databases/redis-devel/Makefile head/databases/redis-devel/distinfo head/databases/redis-devel/files/extra-patch-src-Makefile.lua head/databases/redis-devel/files/extra-patch-src-Makefile.luajit head/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or head/databases/redis-devel/files/patch-deps-Makefile head/databases/redis-devel/files/patch-deps-hiredis-Makefile head/databases/redis-devel/files/patch-deps_Makefile head/databases/redis-devel/files/patch-redis.conf Modified: head/databases/redis-devel/Makefile ============================================================================== --- head/databases/redis-devel/Makefile Wed Jan 13 17:01:30 2021 (r561489) +++ head/databases/redis-devel/Makefile Wed Jan 13 17:31:22 2021 (r561490) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= redis -PORTVERSION= 6.0.10.20210112 -PORTREVISION= 1 +DISTVERSION= 6.2.0rc2 CATEGORIES= databases PKGNAMESUFFIX= -devel @@ -15,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES+= compiler:c11 gmake USE_GITHUB= yes -GH_TUPLE= redis:${PORTNAME}:8d70d49 +GH_TUPLE= redis:${PORTNAME}:ec2d180 OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB OPTIONS_RADIO= EXTLUA Modified: head/databases/redis-devel/distinfo ============================================================================== --- head/databases/redis-devel/distinfo Wed Jan 13 17:01:30 2021 (r561489) +++ head/databases/redis-devel/distinfo Wed Jan 13 17:31:22 2021 (r561490) @@ -1,3 +1,3 @@ -TIMESTAMP = 1610549664 -SHA256 (redis-redis-6.0.10.20210112-8d70d49_GH0.tar.gz) = 8280c19d124cd894428af68a52dfa529f93a9c7af808502cbe352801f33a0180 -SIZE (redis-redis-6.0.10.20210112-8d70d49_GH0.tar.gz) = 2294074 +TIMESTAMP = 1610554801 +SHA256 (redis-redis-6.2.0rc2-ec2d180_GH0.tar.gz) = 8f727a04f3054239ab21e05a527b854e8dd65728833bba1bc4fd3d30fdc486ad +SIZE (redis-redis-6.2.0rc2-ec2d180_GH0.tar.gz) = 2400829 Modified: head/databases/redis-devel/files/extra-patch-src-Makefile.lua ============================================================================== --- head/databases/redis-devel/files/extra-patch-src-Makefile.lua Wed Jan 13 17:01:30 2021 (r561489) +++ head/databases/redis-devel/files/extra-patch-src-Makefile.lua Wed Jan 13 17:31:22 2021 (r561490) @@ -1,15 +1,15 @@ ---- src/Makefile.orig 2020-05-15 16:29:52.000000000 -0400 -+++ src/Makefile 2020-05-16 12:20:46.728148000 -0400 +--- src/Makefile.orig 2021-01-12 09:21:03.000000000 -0500 ++++ src/Makefile 2021-01-13 11:52:33.070529000 -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 +-DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram ++DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram NODEPS:=clean distclean # Default settings -@@ -73,8 +73,8 @@ +@@ -83,8 +83,8 @@ # Override default settings if possible -include .make-settings @@ -20,17 +20,17 @@ FINAL_LIBS=-lm DEBUG=-g -ggdb -@@ -149,7 +149,7 @@ +@@ -188,7 +188,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 +-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 -@@ -197,6 +197,9 @@ - FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto +@@ -251,6 +251,9 @@ + FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS) endif +FINAL_CFLAGS+=-I${PREFIX}/include/lua51 @@ -39,15 +39,15 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -217,6 +220,7 @@ +@@ -271,6 +274,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 gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.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 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 gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.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 + 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_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX) -@@ -268,7 +272,7 @@ +@@ -324,7 +328,7 @@ # redis-server $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) Modified: head/databases/redis-devel/files/extra-patch-src-Makefile.luajit ============================================================================== --- head/databases/redis-devel/files/extra-patch-src-Makefile.luajit Wed Jan 13 17:01:30 2021 (r561489) +++ head/databases/redis-devel/files/extra-patch-src-Makefile.luajit Wed Jan 13 17:31:22 2021 (r561490) @@ -1,15 +1,15 @@ ---- src/Makefile.orig 2020-05-15 16:29:52.000000000 -0400 -+++ src/Makefile 2020-05-16 12:25:33.461058000 -0400 +--- src/Makefile.orig 2021-01-12 09:21:03.000000000 -0500 ++++ src/Makefile 2021-01-13 12:25:07.823451000 -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 +-DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram ++DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram NODEPS:=clean distclean # Default settings -@@ -73,8 +73,8 @@ +@@ -83,8 +83,8 @@ # Override default settings if possible -include .make-settings @@ -20,17 +20,17 @@ FINAL_LIBS=-lm DEBUG=-g -ggdb -@@ -149,7 +149,7 @@ +@@ -188,7 +188,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 +-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 -@@ -197,6 +197,9 @@ - FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto +@@ -251,6 +251,9 @@ + FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS) endif +FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0 @@ -39,15 +39,15 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -217,6 +220,7 @@ +@@ -271,6 +274,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 gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.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 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 gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.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 + 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_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX) -@@ -268,7 +272,7 @@ +@@ -324,7 +328,7 @@ # redis-server $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) Modified: head/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or ============================================================================== --- head/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or Wed Jan 13 17:01:30 2021 (r561489) +++ head/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or Wed Jan 13 17:31:22 2021 (r561490) @@ -1,15 +1,15 @@ ---- src/Makefile.orig 2020-05-15 16:29:52.000000000 -0400 -+++ src/Makefile 2020-05-16 12:22:56.630826000 -0400 +--- src/Makefile.orig 2021-01-12 09:21:03.000000000 -0500 ++++ src/Makefile 2021-01-13 12:27:19.444193000 -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 +-DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram ++DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram NODEPS:=clean distclean # Default settings -@@ -73,8 +73,8 @@ +@@ -83,8 +83,8 @@ # Override default settings if possible -include .make-settings @@ -20,17 +20,17 @@ FINAL_LIBS=-lm DEBUG=-g -ggdb -@@ -149,7 +149,7 @@ +@@ -188,7 +188,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 +-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 -@@ -197,6 +197,9 @@ - FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto +@@ -251,6 +251,9 @@ + FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS) endif +FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1 @@ -39,15 +39,15 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -217,6 +220,7 @@ +@@ -271,6 +274,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 gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.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 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 gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.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 + 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_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX) -@@ -268,7 +272,7 @@ +@@ -324,7 +328,7 @@ # redis-server $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) Modified: head/databases/redis-devel/files/patch-deps-Makefile ============================================================================== --- head/databases/redis-devel/files/patch-deps-Makefile Wed Jan 13 17:01:30 2021 (r561489) +++ head/databases/redis-devel/files/patch-deps-Makefile Wed Jan 13 17:31:22 2021 (r561490) @@ -1,15 +1,15 @@ ---- deps/Makefile.orig 2019-09-25 10:40:18 UTC -+++ deps/Makefile -@@ -58,7 +58,7 @@ ifeq ($(uname_S),SunOS) +--- deps/Makefile.orig 2021-01-12 09:21:03.000000000 -0500 ++++ deps/Makefile 2021-01-13 11:37:45.979445000 -0500 +@@ -69,7 +69,7 @@ LUA_CFLAGS= -D__C99FEATURES__=1 endif --LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS) -+LUA_CFLAGS+= -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS) +-LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS) ++LUA_CFLAGS+= -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS) LUA_LDFLAGS+= $(LDFLAGS) # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more # challenging to cross-compile lua (and redis). These defines make it easier -@@ -68,7 +68,7 @@ ARFLAGS=rcu +@@ -79,7 +79,7 @@ lua: .make-prerequisites @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) Modified: head/databases/redis-devel/files/patch-deps-hiredis-Makefile ============================================================================== --- head/databases/redis-devel/files/patch-deps-hiredis-Makefile Wed Jan 13 17:01:30 2021 (r561489) +++ head/databases/redis-devel/files/patch-deps-hiredis-Makefile Wed Jan 13 17:31:22 2021 (r561490) @@ -1,6 +1,6 @@ ---- deps/hiredis/Makefile.orig 2019-11-29 16:35:59 UTC -+++ deps/hiredis/Makefile -@@ -21,7 +21,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a +--- deps/hiredis/Makefile.orig 2021-01-12 09:21:03.000000000 -0500 ++++ deps/hiredis/Makefile 2021-01-13 11:40:26.109827000 -0500 +@@ -21,7 +21,7 @@ HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}') # Installation related variables and target @@ -9,7 +9,7 @@ INCLUDE_PATH?=include/hiredis LIBRARY_PATH?=lib PKGCONF_PATH?=pkgconfig -@@ -44,10 +44,8 @@ export REDIS_TEST_CONFIG +@@ -44,10 +44,8 @@ # Fallback to gcc when $CC is not in $PATH. CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') @@ -21,11 +21,11 @@ REAL_LDFLAGS=$(LDFLAGS) DYLIBSUFFIX=so -@@ -82,6 +80,16 @@ endif - ifeq ($(uname_S),SunOS) - REAL_LDFLAGS+= -ldl -lnsl -lsocket - DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS) -+endif +@@ -83,7 +81,16 @@ + CFLAGS+=-I$(OPENSSL_PREFIX)/include + SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto + endif +- +ifeq ($(uname_S),FreeBSD) + CFLAGS?=$(CFLAGS) + CCLINK?=pthread @@ -34,7 +34,8 @@ + DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ} + STLIBNAME?=libhiredis.a + STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ} -+ SSL_LDFLAGS+= ${OPENSSL_LDFLAGS} - endif - ifeq ($(uname_S),Darwin) - DYLIBSUFFIX=dylib ++ SSL_LDFLAGS+=${OPENSSL_LDFLAGS} ++endif + ifeq ($(uname_S),SunOS) + IS_SUN_CC=$(shell sh -c '$(CC) -V 2>&1 |egrep -i -c "sun|studio"') + ifeq ($(IS_SUN_CC),1) Modified: head/databases/redis-devel/files/patch-deps_Makefile ============================================================================== --- head/databases/redis-devel/files/patch-deps_Makefile Wed Jan 13 17:01:30 2021 (r561489) +++ head/databases/redis-devel/files/patch-deps_Makefile Wed Jan 13 17:31:22 2021 (r561490) @@ -1,6 +1,6 @@ ---- deps/Makefile.orig 2019-11-29 16:35:59 UTC -+++ deps/Makefile -@@ -76,12 +76,12 @@ lua: .make-prerequisites +--- deps/Makefile.orig 2021-01-13 11:43:05.174197000 -0500 ++++ deps/Makefile 2021-01-13 11:44:13.744658000 -0500 +@@ -83,12 +83,12 @@ .PHONY: lua @@ -10,9 +10,9 @@ 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 && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ 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 && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ 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 Modified: head/databases/redis-devel/files/patch-redis.conf ============================================================================== --- head/databases/redis-devel/files/patch-redis.conf Wed Jan 13 17:01:30 2021 (r561489) +++ head/databases/redis-devel/files/patch-redis.conf Wed Jan 13 17:31:22 2021 (r561490) @@ -1,24 +1,24 @@ ---- redis.conf.orig 2019-11-22 16:54:22 UTC -+++ redis.conf -@@ -203,7 +203,7 @@ tcp-keepalive 300 - +--- redis.conf.orig 2021-01-12 09:21:03.000000000 -0500 ++++ redis.conf 2021-01-13 11:46:40.445746000 -0500 +@@ -244,7 +244,7 @@ # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. + # When Redis is supervised by upstart or systemd, this parameter has no impact. -daemonize no +daemonize yes # If you run Redis from upstart or systemd, Redis can interact with your # supervision tree. Options: -@@ -225,7 +225,7 @@ supervised no +@@ -276,7 +276,7 @@ # - # Creating a pid file is best effort: if Redis is not able to create it - # nothing bad happens, the server will start and run normally. + # Note that on modern Linux systems "/run/redis.pid" is more conforming + # and should be used instead. -pidfile /var/run/redis_6379.pid +pidfile %%REDIS_RUNDIR%%/redis.pid # Specify the server verbosity level. # This can be one of: -@@ -238,7 +238,7 @@ loglevel notice +@@ -289,7 +289,7 @@ # Specify the log file name. Also the empty string can be used to force # Redis to log on the standard output. Note that if you use standard # output for logging but daemonize, logs will be sent to /dev/null @@ -27,7 +27,7 @@ # To enable logging to the system logger, just set 'syslog-enabled' to yes, # and optionally update the other syslog parameters to suit your needs. -@@ -330,7 +330,7 @@ dbfilename dump.rdb +@@ -420,7 +420,7 @@ # The Append Only File will also be created inside this directory. # # Note that you must specify a directory here, not a file name.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101131731.10DHVNwV057304>