Compare commits

..

No commits in common. "2508a45d67da523ce447169dcbfed5ab0c66c453" and "d7ba9aa9ccc673804f7680ae0c653f875d805a4c" have entirely different histories.

5 changed files with 2 additions and 5522 deletions

View File

@ -1,26 +0,0 @@
From 2e2eade35a9aabd1109a7f457b1da444fb0a8141 Mon Sep 17 00:00:00 2001
From: WangQiang <wangqiang1@kylinos.cn>
Date: Tue, 28 Jun 2022 10:38:31 +0800
Subject: [PATCH] Add loongarch64 support
---
.../include/jemalloc/internal/jemalloc_internal_types.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h b/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h
index 1b750b1..780627d 100644
--- a/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h
+++ b/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h
@@ -107,6 +107,9 @@ typedef int malloc_cpuid_t;
# ifdef __tile__
# define LG_QUANTUM 4
# endif
+# ifdef __loongarch__
+# define LG_QUANTUM 4
+# endif
# ifdef __le32__
# define LG_QUANTUM 4
# endif
--
2.27.0

View File

@ -1,13 +0,0 @@
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 <sys/types.h>
#include <stdarg.h>

View File

@ -1,25 +0,0 @@
From 8c4c3730d69ea1e3352d35e18999d42dca4c07e5 Mon Sep 17 00:00:00 2001
From: lingsheng <lingsheng@huawei.com>
Date: Mon, 29 Mar 2021 17:37:06 +0800
Subject: [PATCH] Modify aarch64 architecture jemalloc page size from 4k to 64k
---
deps/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/deps/Makefile b/deps/Makefile
index eb35c1e..2ba6ae3 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -77,7 +77,7 @@ JEMALLOC_LDFLAGS= $(LDFLAGS)
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_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" --with-lg-page=16
cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
.PHONY: jemalloc
--
2.23.0

File diff suppressed because it is too large Load Diff

View File

@ -6,7 +6,7 @@
%global Pname redis
Name: redis5
Version: 5.0.7
Release: 6
Release: 1
Summary: A persistent key-value database
License: BSD and MIT
URL: https://redis.io
@ -21,12 +21,6 @@ Source7: %{Pname}-limit-systemd
Source8: %{Pname}-limit-init
Source9: macros.%{Pname}
Source10: https://github.com/antirez/%{Pname}-doc/archive/%{doc_commit}/%{Pname}-doc-%{short_doc_commit}.tar.gz
Patch0001: Modify-aarch64-architecture-jemalloc-page-size-from-from-4k-to-64k.patch
Patch0002: Fix-redis5-gcc-10.patch
Patch0003: Add-loongarch64-support.patch
Patch0004: Update-config.guess-and-config.sub.patch
BuildRequires: gcc
%if %{with tests}
BuildRequires: procps-ng tcl
@ -44,9 +38,6 @@ Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
Provides: redis(modules_abi) = 1
Conflicts: redis < 5.0
Conflicts: redis > 6.0
%description
Redis is an advanced key-value store. It is often referred to as a data
structure server since keys can contain strings, hashes, lists, sets and
@ -85,15 +76,7 @@ administration and development.
%prep
tar -xvf %{SOURCE10}
%setup -n %{Pname}-%{version}
%ifarch aarch64
%patch0001 -p1
%endif
%patch0002 -p1
%ifarch loongarch64
%patch0003 -p1
%patch0004 -p1
%endif
%autosetup -n %{Pname}-%{version}
mv ../%{Pname}-doc-%{doc_commit} doc
mv deps/lua/COPYRIGHT COPYRIGHT-lua
mv deps/hiredis/COPYING COPYING-hiredis
@ -198,21 +181,5 @@ exit 0
%{_docdir}/%{Pname}
%changelog
* Mon Dec 18 2023 xiexing <xiexing4@h-partners.com> - 5.0.7-6
- add Conflicts in spec
* Tue Dec 27 2022 Ge Wang <wangge20@h-partners.com> - 5.0.7-5
- Add loongarch64 support
- Update config.guess and config.sub
* Thu Sep 02 2021 lingsheng <lingsheng@huawei.com> - 5.0.7-4
- Fix missing patch in source package
* Tue Aug 03 2021 wangyong <wangyong187@huawei.com> - 5.0.7-3
- Fix build error caused by GCC upgrade to GCC-10
* Mon Mar 29 2021 lingsheng <lingsheng@huawei.com> - 5.0.7-2
- Modify aarch64 architecture jemalloc page size from 4k to 64k
* Sat Mar 20 2021 huanghaitao <huanghaitao8@huawei.com> - 5.0.7-1
- package init