summaryrefslogtreecommitdiff
path: root/dev-db/redis/files
diff options
context:
space:
mode:
authorPetr Vaněk <arkamar@atlas.cz>2023-08-16 11:05:15 +0200
committerSam James <sam@gentoo.org>2023-08-17 07:22:36 +0100
commitcc931041a662369979ebd6d95b157985c8a97311 (patch)
tree6794bdcdb9c5efc37810f37a17d82ac041ded5ac /dev-db/redis/files
parent89ae9a135fc72a539ae9e5603dff2524b78e8870 (diff)
downloadgentoo-cc931041a662369979ebd6d95b157985c8a97311.tar.gz
gentoo-cc931041a662369979ebd6d95b157985c8a97311.tar.bz2
gentoo-cc931041a662369979ebd6d95b157985c8a97311.zip
dev-db/redis: add 7.2.0
Two patches were necessary to rebase, the *-shared.patch was renamed to *-system-jemalloc.patch which better suits the change. Boost-1.0 was appended to LICENSE because of newly bundled fpconv. It is not necessary to append -DENABLE_CJSON_GLOBAL to cflags as it is correctly set in deps/Makefile, thus flag-o-matic is no longer used. -O2 is stripped from LUA_CLFAGS in order to respect user's CFLAGS. The "big" sed for all Makefiles was revised, all expressions are moved to a local mysedconf array, obsolete expressions are removed and it newly strips recently appended -Werror* flags. myconf is transformed to an array, with newly added OPTIMIZATION and DEBUG_FLAGS defined as empty strings in order to respect user's CFLAGS. USE_SYSTEMD is moved to the array as well. github link is appended to HOMEPAGE. Signed-off-by: Petr Vaněk <arkamar@atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/32338 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-db/redis/files')
-rw-r--r--dev-db/redis/files/redis-7.2.0-system-jemalloc.patch33
-rw-r--r--dev-db/redis/files/redis-sentinel-7.2.0-config.patch27
2 files changed, 60 insertions, 0 deletions
diff --git a/dev-db/redis/files/redis-7.2.0-system-jemalloc.patch b/dev-db/redis/files/redis-7.2.0-system-jemalloc.patch
new file mode 100644
index 000000000000..cc2c51a50ea9
--- /dev/null
+++ b/dev-db/redis/files/redis-7.2.0-system-jemalloc.patch
@@ -0,0 +1,33 @@
+Rebased from original redis-5.0-shared.patch
+
+diff --git a/src/Makefile b/src/Makefile
+index ecbd2753d..275446338 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -65,10 +65,7 @@ PYTHON := $(shell which python3 || which python)
+ endif
+
+ # Default allocator defaults to Jemalloc on Linux and libc otherwise
+-MALLOC=libc
+-ifeq ($(uname_S),Linux)
+- MALLOC=jemalloc
+-endif
++MALLOC?=jemalloc
+
+ # To get ARM stack traces if Redis crashes we need a special C flag.
+ ifneq (,$(filter aarch64 armv%,$(uname_M)))
+@@ -266,9 +263,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)
+ endif
+
+ ifeq ($(MALLOC),jemalloc)
+- DEPENDENCY_TARGETS+= jemalloc
+- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
+- FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
++ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE
++ FINAL_LIBS+= -ljemalloc -ldl
+ endif
+
+ # LIBSSL & LIBCRYPTO
+--
+2.41.0
+
diff --git a/dev-db/redis/files/redis-sentinel-7.2.0-config.patch b/dev-db/redis/files/redis-sentinel-7.2.0-config.patch
new file mode 100644
index 000000000000..db9df6786c19
--- /dev/null
+++ b/dev-db/redis/files/redis-sentinel-7.2.0-config.patch
@@ -0,0 +1,27 @@
+Rebased from original redis-sentinel-5.0-config.patch
+
+diff --git a/sentinel.conf b/sentinel.conf
+index b7b3604f0..a1d7bfea9 100644
+--- a/sentinel.conf
++++ b/sentinel.conf
+@@ -17,7 +17,7 @@ daemonize no
+ # When running daemonized, Redis Sentinel writes a pid file in
+ # /var/run/redis-sentinel.pid by default. You can specify a custom pid file
+ # location here.
+-pidfile /var/run/redis-sentinel.pid
++pidfile /run/redis-sentinel.pid
+
+ # Specify the server verbosity level.
+ # This can be one of:
+@@ -31,7 +31,7 @@ loglevel notice
+ # Specify the log file name. Also the empty string can be used to force
+ # Sentinel to log on the standard output. Note that if you use standard
+ # output for logging but daemonize, logs will be sent to /dev/null
+-logfile ""
++logfile "/var/log/redis/sentinel.log"
+
+ # To enable logging to the system logger, just set 'syslog-enabled' to yes,
+ # and optionally update the other syslog parameters to suit your needs.
+--
+2.41.0
+