diff --git a/dev-db/redis/files/redis-8.2.6-tcmalloc-deprecated.patch b/dev-db/redis/files/redis-8.2.6-tcmalloc-deprecated.patch new file mode 100644 index 0000000000000..a0c3a65d68e4e --- /dev/null +++ b/dev-db/redis/files/redis-8.2.6-tcmalloc-deprecated.patch @@ -0,0 +1,38 @@ +https://bugs.gentoo.org/976643 +https://github.com/valkey-io/valkey/commit/c15eee3407ecca35f274afc76e52a602a18ddfa1 + +From c15eee3407ecca35f274afc76e52a602a18ddfa1 Mon Sep 17 00:00:00 2001 +From: Ricardo Dias +Date: Mon, 23 Sep 2024 09:23:48 +0100 +Subject: [PATCH] Changes `tcmalloc.h` header location (#1039) + +This commit changes the `tcmalloc.h` header location from the deprecated +location `google/` to `gperftools/`. + +**Why we're doing this now?** + +The location `google/tcmalloc.h` has been deprecated for more than 10 +years in favor of `gperftools/tcmalloc.h`, and the deprecated location +will be removed in the next release of gperftools. + +Fixes #1033 + +Signed-off-by: Ricardo Dias +--- + src/zmalloc.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/zmalloc.h b/src/zmalloc.h +index f389b905c03..ada2257616f 100644 +--- a/src/zmalloc.h ++++ b/src/zmalloc.h +@@ -39,7 +39,7 @@ + + #if defined(USE_TCMALLOC) + #define ZMALLOC_LIB ("tcmalloc-" __xstr(TC_VERSION_MAJOR) "." __xstr(TC_VERSION_MINOR)) +-#include ++#include + #if (TC_VERSION_MAJOR == 1 && TC_VERSION_MINOR >= 6) || (TC_VERSION_MAJOR > 1) + #define HAVE_MALLOC_SIZE 1 + #define zmalloc_size(p) tc_malloc_size(p) + diff --git a/dev-db/redis/redis-8.2.6.ebuild b/dev-db/redis/redis-8.2.6.ebuild index 45be7f83231e9..964788104d199 100644 --- a/dev-db/redis/redis-8.2.6.ebuild +++ b/dev-db/redis/redis-8.2.6.ebuild @@ -56,6 +56,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch "${FILESDIR}"/${PN}-sentinel-7.2.0-config.patch "${FILESDIR}"/${PN}-7.0.4-no-which.patch + "${FILESDIR}"/${PN}-8.2.6-tcmalloc-deprecated.patch ) src_prepare() { diff --git a/dev-db/redis/redis-8.4.3.ebuild b/dev-db/redis/redis-8.4.3.ebuild index a1ecad8e2eda6..411ca595cea4c 100644 --- a/dev-db/redis/redis-8.4.3.ebuild +++ b/dev-db/redis/redis-8.4.3.ebuild @@ -56,6 +56,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch "${FILESDIR}"/${PN}-sentinel-7.2.0-config.patch "${FILESDIR}"/${PN}-7.0.4-no-which.patch + "${FILESDIR}"/${PN}-8.2.6-tcmalloc-deprecated.patch ) src_prepare() { diff --git a/dev-db/redis/redis-8.6.3.ebuild b/dev-db/redis/redis-8.6.3.ebuild index a1ecad8e2eda6..411ca595cea4c 100644 --- a/dev-db/redis/redis-8.6.3.ebuild +++ b/dev-db/redis/redis-8.6.3.ebuild @@ -56,6 +56,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch "${FILESDIR}"/${PN}-sentinel-7.2.0-config.patch "${FILESDIR}"/${PN}-7.0.4-no-which.patch + "${FILESDIR}"/${PN}-8.2.6-tcmalloc-deprecated.patch ) src_prepare() {