diff options
| author | Yoav Steinberg <yoav@monfort.co.il> | 2021-10-11 10:09:36 +0300 |
|---|---|---|
| committer | Yoav Steinberg <yoav@monfort.co.il> | 2021-10-12 12:55:35 +0300 |
| commit | 85737e674552bafefb6beb9a37531645e5d2178b (patch) | |
| tree | 6271749c0f1cbc01639e3dfee04e0c0894e87069 /deps | |
| parent | ed92a3e8ed6bd4a30abca297bdb6f53331f92129 (diff) | |
| download | redis-85737e674552bafefb6beb9a37531645e5d2178b.tar.gz | |
Added jemalloc subtree upgrade instructions.
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/README.md | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/deps/README.md b/deps/README.md index c3ec424b6..65b759899 100644 --- a/deps/README.md +++ b/deps/README.md @@ -41,6 +41,22 @@ the following additional steps: changed, otherwise you could just copy the old implementation if you are upgrading just to a similar version of Jemalloc. +#### Updating/upgrading jemalloc + +The jemalloc directory is pulled as a subtee from the upstream jemalloc github repo. To update it you should run from the project root: + +1. `git subtree pull --prefix deps/jemalloc https://github.com/jemalloc/jemalloc.git <version-tag> --squash`<br> +This should hopefully merge the local changes into the new version. +2. In case any conflicts arise (due to our changes) you'll need to resolve them and commit. +3. Reconfigure jemalloc:<br> +```sh +rm deps/jemalloc/VERSION deps/jemalloc/configure +cd deps/jemalloc +./autogen.sh --with-version=<version-tag>-0-g0 +``` +4. Update jemalloc's version in `deps/Makefile`: search for "`--with-version=<old-version-tag>-0-g0`" and update it accordingly. +5. Commit the changes (VERSION,configure,Makefile). + Hiredis --- @@ -78,5 +94,3 @@ and our version: 1. Makefile is modified to allow a different compiler than GCC. 2. We have the implementation source code, and directly link to the following external libraries: `lua_cjson.o`, `lua_struct.o`, `lua_cmsgpack.o` and `lua_bit.o`. 3. There is a security fix in `ldo.c`, line 498: The check for `LUA_SIGNATURE[0]` is removed in order to avoid direct bytecode execution. - - |