From f911aef90d295fbc4589e55e31057f3176d856bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8B=87?= Date: Tue, 3 Aug 2021 17:04:39 +0800 Subject: [PATCH] fix failure caused by GCC upgrade to GCC-10 --- Fix-redis5-gcc-10.patch | 13 +++++++++++++ redis5.spec | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 Fix-redis5-gcc-10.patch diff --git a/Fix-redis5-gcc-10.patch b/Fix-redis5-gcc-10.patch new file mode 100644 index 0000000..97ba868 --- /dev/null +++ b/Fix-redis5-gcc-10.patch @@ -0,0 +1,13 @@ +diff --git a/src/sds.h b/src/sds.h +index 1bdb60d..adcc12c 100644 +--- a/src/sds.h ++++ b/src/sds.h +@@ -34,7 +34,7 @@ + #define __SDS_H + + #define SDS_MAX_PREALLOC (1024*1024) +-const char *SDS_NOINIT; ++extern const char *SDS_NOINIT; + + #include + #include diff --git a/redis5.spec b/redis5.spec index c760cc7..310a54c 100644 --- a/redis5.spec +++ b/redis5.spec @@ -6,7 +6,7 @@ %global Pname redis Name: redis5 Version: 5.0.7 -Release: 2 +Release: 3 Summary: A persistent key-value database License: BSD and MIT URL: https://redis.io @@ -24,6 +24,7 @@ Source10: https://github.com/antirez/%{Pname}-doc/archive/%{doc_commi %ifarch aarch64 Patch0001: Modify-aarch64-architecture-jemalloc-page-size-from-from-4k-to-64k.patch %endif +Patch0002: Fix-redis5-gcc-10.patch BuildRequires: gcc %if %{with tests} BuildRequires: procps-ng tcl @@ -184,6 +185,9 @@ exit 0 %{_docdir}/%{Pname} %changelog +* Tue Aug 03 2021 wangyong - 5.0.7-3 +- Fix build error caused by GCC upgrade to GCC-10 + * Mon Mar 29 2021 lingsheng - 5.0.7-2 - Modify aarch64 architecture jemalloc page size from 4k to 64k -- Gitee