Skip to content
Snippets Groups Projects
Commit e830a34b8b88 authored by Clemens Beck's avatar Clemens Beck
Browse files

Update Redis from 7.0.15 to 7.2.7

Relates https://gitlab.com/gitlab-org/distribution/team-tasks/-/issues/1694

Changelog: changed
parent 3f7b2f5aaa48
No related merge requests found
diff --git a/deps/Makefile b/deps/Makefile
index 8592e1766..08da5ce20 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -99,7 +99,7 @@ endif
jemalloc: .make-prerequisites
@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
- cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
+ cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ $(EXTRA_JEMALLOC_CONFIGURE_FLAGS) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
.PHONY: jemalloc
......@@ -25,7 +25,7 @@
dependency 'config_guess'
dependency 'openssl' unless Build::Check.use_system_ssl?
version = Gitlab::Version.new('redis', '7.0.15')
version = Gitlab::Version.new('redis', '7.2.7')
default_version version.print(false)
source git: version.remote
......@@ -49,10 +49,8 @@
# jemallocs page size must be >= to the runtime pagesize
# Use large for arm/newer platforms based on debian rules:
# https://salsa.debian.org/debian/jemalloc/-/blob/c0a88c37a551be7d12e4863435365c9a6a51525f/debian/rules#L8-23
env['EXTRA_JEMALLOC_CONFIGURE_FLAGS'] = (OhaiHelper.arm64? ? '--with-lg-page=16' : '--with-lg-page=12')
patch source: 'jemalloc-extra-config-flags.patch'
# https://salsa.debian.org/debian/jemalloc/-/blob/241fec81556098d6840e3684d2b4b69fea9258ef/debian/rules#L8-23
env['JEMALLOC_CONFIGURE_OPTS'] = (OhaiHelper.arm64? ? ' --with-lg-page=16' : ' --with-lg-page=12')
update_config_guess
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment