diff options
Diffstat (limited to 'dev-db/redis')
| -rw-r--r-- | dev-db/redis/Manifest | 2 | ||||
| -rw-r--r-- | dev-db/redis/files/redis-5.0-sharedlua.patch | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index b461c5bfe4aa..4606b472ce2c 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -5,7 +5,7 @@ AUX redis-3.2.5-shared.patch 754 BLAKE2B cb119c20e219ab7c38bceffa9f7b3e59dc4eafe AUX redis-4.0.1-shared.patch 866 BLAKE2B 55531d6437ba89e37674377795ed8f7b4a34982571358d3ac73071951929ba96f101dfc9f9336f04d3851b4d360023c50d7832d9ae5ba9cfa405f317ec70b983 SHA512 f58ae83d3370949187325b1f1f75feb7d85d3112ae65e7cd330d193490c42aa6288f05cd4d2309dbde5d32015a067ec831255a3dab937cd0889970c8eecfb3f1 AUX redis-4.0.1-sharedlua.patch 2568 BLAKE2B dc943602aba26455b94536571ee6be2969cbdf04da63805db0da0de5c5da3eb5fe16bb3c9e282020cf5a0d2cb9ac02244614fb8929847ce930c2ed25f4c4b8ff SHA512 c7c08b67c09425876da513bbeb52667fe5917b56a43749a914dac356fa37c091b696765eabca100f2506cf461107abdbf22bce075879a8aa82a0e8d54f696fee AUX redis-5.0-shared.patch 883 BLAKE2B 71a490d5c40d873db7d363c4f3cab966bf8e92fa84bcb7209344b79b3bfc4c6f8df5224c8ae0e5d9ee8dbd62d9e288e90934809e91fd6f63c7d1dd4a518170a9 SHA512 f1d1e37a4786a84e9543956e21644a1dcfdc52742299119ba1547b9fb56a92fdef3ca518d94a1db8a88222b661ac7849a4db0bf7ba38b1ae65f286e7df90f0c1 -AUX redis-5.0-sharedlua.patch 2624 BLAKE2B d6c392c03e751ba6c4d556b3b10a28fd83d07f04fdc7b27d4d7f26d4380d9e28183a26cc9b36577afd645457a90744b479753c20d2d59343cd8dbd4bac5ed737 SHA512 ef4e8f474d2680c317ca7064dae7ce0bcafa142e18061a29bd8794eeab32efd1846d8ef5e43b059af5bb6b777d8395d091d0fabe31799df8ef7da75de70d2e18 +AUX redis-5.0-sharedlua.patch 2623 BLAKE2B 6b17254fab8022dee604749364b4cf4b64d7f5157740165da4eaba8866a44819603d1e7c3b2dae6bf66a3e70a43343c76766bebc1c4dd57b7c3bb402a4a747a1 SHA512 af4e08c0c6e1a1e8f26c625a70ce903ddfecd81db8047a851fd958d0174f89511acce2510b9bcc25fb850c90b5cfd7a61a6e90cd242f8e68b72b1b67b6cdc87d AUX redis-sentinel-4.0.6-config.patch 285 BLAKE2B 97b8fb6c2af74e6d2736e9dcdd9faa579800fecec53752168fc5e5e43c509fc00a1192215b5fef89af915456e5ab0d7c438df51e2b214399a4482f7683525a8b SHA512 12fd77b38fbcc3bf4b25f519a8f40e43c5d2f32be341155f5e6d08f2a4513043917452d45a20608dc56c0e92e324cef8480d42d670752056c821b4ffca93e2b1 AUX redis-sentinel-5.0-config.patch 367 BLAKE2B 75281a9b0de0d453cb2948d1641c4f0a7a8b5acdb7ffc35186f29859e1f69835be0f56b0734757a73dbd3239a7e8b9e7db5fe31a82e3ac60bbafe86ca400c35b SHA512 7b882cb1a0d976fc1dfb30b305731cc9239dcf7f30e3a92566325dc1dae5ab94a95c047b3ba1eaa618767e1bbdee31918b552c67eeb0310e74db8cbf64e2c09c AUX redis-sentinel.confd 470 BLAKE2B f77fd7e35c753e35aafa6e773dcc00d2779bc29d8579334078bd6124aab436dff671ae790c0b0e3cefdd4082fe212b4b71501b529176cb0a1e5f8c8cdcf1387e SHA512 ea455f8c73c21bc46127ea5c7b99dc5707ad41160e5fd61367555dd2e3fd5c1518026257651e7d371a60a64b682b6839dd37580f75308c73239edeba49d6b372 diff --git a/dev-db/redis/files/redis-5.0-sharedlua.patch b/dev-db/redis/files/redis-5.0-sharedlua.patch index 3b97f913c604..76971cf4571e 100644 --- a/dev-db/redis/files/redis-5.0-sharedlua.patch +++ b/dev-db/redis/files/redis-5.0-sharedlua.patch @@ -12,7 +12,7 @@ index c26c0d7..fa50c41 100644 #ifndef CJSON_MODNAME #define CJSON_MODNAME "cjson" diff --git a/src/Makefile b/src/Makefile -index 6f12a20..205cd59 100644 +index f5525bd..cecd8d0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh') @@ -24,16 +24,15 @@ index 6f12a20..205cd59 100644 NODEPS:=clean distclean # Default settings -@@ -58,7 +58,7 @@ endif - +@@ -66,6 +66,7 @@ endif FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) --FINAL_LIBS=-lm -+FINAL_LIBS=@LUA_LIBS@ + FINAL_LIBS=-lm ++FINAL_LIBS+=@LUA_LIBS@ DEBUG=-g -ggdb ifeq ($(uname_S),SunOS) -@@ -100,7 +100,7 @@ endif +@@ -107,7 +108,7 @@ endif endif endif # Include paths to dependencies @@ -42,7 +41,7 @@ index 6f12a20..205cd59 100644 ifeq ($(MALLOC),tcmalloc) FINAL_CFLAGS+= -DUSE_TCMALLOC -@@ -137,6 +137,7 @@ endif +@@ -145,6 +146,7 @@ endif REDIS_SERVER_NAME=redis-server REDIS_SENTINEL_NAME=redis-sentinel REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o @@ -50,7 +49,7 @@ index 6f12a20..205cd59 100644 REDIS_CLI_NAME=redis-cli REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o REDIS_BENCHMARK_NAME=redis-benchmark -@@ -188,7 +189,7 @@ endif +@@ -196,7 +198,7 @@ endif # redis-server $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) |