diff options
| author | Remi Collet <remi@remirepo.net> | 2020-06-26 07:53:16 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-06-26 07:53:16 +0200 |
| commit | e69a56b7c50b89ce8c6dcc40313585f8f3dcab52 (patch) | |
| tree | d8bb4ebf1da3aedd99656f52c3e7bdc65775b084 /redis-lz4.patch | |
| parent | 0e0067c9056224a781b18d68a91eaba83e8ce35d (diff) | |
update to 5.3.0RC1
enable lz4 compression support
drop patch merged upstream
add upstream patch to fix lz4 library name
add new option in provided configuration file
Diffstat (limited to 'redis-lz4.patch')
| -rw-r--r-- | redis-lz4.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/redis-lz4.patch b/redis-lz4.patch new file mode 100644 index 0000000..6357c09 --- /dev/null +++ b/redis-lz4.patch @@ -0,0 +1,69 @@ +From 19269cb1db073376364d2655fc828daeb8f1006e Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 26 Jun 2020 07:18:57 +0200 +Subject: [PATCH 1/2] fix lz4 library name + +--- + config.m4 | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/config.m4 b/config.m4 +index 3044930..2105801 100644 +--- a/config.m4 ++++ b/config.m4 +@@ -201,7 +201,8 @@ if test "$PHP_REDIS" != "no"; then + fi + + if test "$PHP_REDIS_LZ4" != "no"; then +- AC_DEFINE(HAVE_REDIS_LZ4, 1, [ ]) ++ AC_DEFINE(HAVE_REDIS_LZ4, 1, [ ]) ++ if test "$PHP_LIBZSTD" != "no"; then + AC_MSG_CHECKING(for liblz4 files in default path) + for i in $PHP_LIBLZ4 /usr/local /usr; do + if test -r $i/include/lz4.h; then +@@ -216,13 +217,16 @@ if test "$PHP_REDIS" != "no"; then + fi + PHP_CHECK_LIBRARY(lz4, LZ4_compress, + [ +- PHP_ADD_LIBRARY_WITH_PATH(zstd, $LIBLZ4_DIR/$PHP_LIBDIR, REDIS_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(lz4, $LIBLZ4_DIR/$PHP_LIBDIR, REDIS_SHARED_LIBADD) + ], [ + AC_MSG_ERROR([could not find usable liblz4]) + ], [ + -L$LIBLZ4_DIR/$PHP_LIBDIR + ]) + PHP_SUBST(REDIS_SHARED_LIBADD) ++ else ++ AC_MSG_ERROR([only system libz4 is supported]) ++ fi + fi + + if test "$PHP_REDIS_ZSTD" != "no"; then +-- +2.25.4 + +From e5de8fa1ffa4824944283d78e9475df527567a49 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 26 Jun 2020 07:21:21 +0200 +Subject: [PATCH 2/2] copy/paste err + +--- + config.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config.m4 b/config.m4 +index 2105801..4445400 100644 +--- a/config.m4 ++++ b/config.m4 +@@ -202,7 +202,7 @@ if test "$PHP_REDIS" != "no"; then + + if test "$PHP_REDIS_LZ4" != "no"; then + AC_DEFINE(HAVE_REDIS_LZ4, 1, [ ]) +- if test "$PHP_LIBZSTD" != "no"; then ++ if test "$PHP_LIBLZ4" != "no"; then + AC_MSG_CHECKING(for liblz4 files in default path) + for i in $PHP_LIBLZ4 /usr/local /usr; do + if test -r $i/include/lz4.h; then +-- +2.25.4 + |