1 |
commit: 1188e502eef26f970153e9c2344f5825f50df2f5 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Feb 12 16:34:34 2019 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 27 05:35:24 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1188e502 |
7 |
|
8 |
dev-db/redis: remove unused patches |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/11033 |
12 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
13 |
|
14 |
dev-db/redis/files/redis-3.2.3-sharedlua.patch | 60 -------------------------- |
15 |
dev-db/redis/files/redis-3.2.5-shared.patch | 30 ------------- |
16 |
2 files changed, 90 deletions(-) |
17 |
|
18 |
diff --git a/dev-db/redis/files/redis-3.2.3-sharedlua.patch b/dev-db/redis/files/redis-3.2.3-sharedlua.patch |
19 |
deleted file mode 100644 |
20 |
index 52de9048463..00000000000 |
21 |
--- a/dev-db/redis/files/redis-3.2.3-sharedlua.patch |
22 |
+++ /dev/null |
23 |
@@ -1,60 +0,0 @@ |
24 |
-diff --git a/deps/lua/src/lua_cjson.c b/deps/lua/src/lua_cjson.c |
25 |
-index c26c0d7..fa50c41 100644 |
26 |
---- a/deps/lua/src/lua_cjson.c |
27 |
-+++ b/deps/lua/src/lua_cjson.c |
28 |
-@@ -46,7 +46,7 @@ |
29 |
- #include "strbuf.h" |
30 |
- #include "fpconv.h" |
31 |
- |
32 |
--#include "../../../src/solarisfixes.h" |
33 |
-+#include "solarisfixes.h" |
34 |
- |
35 |
- #ifndef CJSON_MODNAME |
36 |
- #define CJSON_MODNAME "cjson" |
37 |
-diff --git a/src/Makefile b/src/Makefile |
38 |
-index 648127a..1f96d98 100644 |
39 |
---- a/src/Makefile |
40 |
-+++ b/src/Makefile |
41 |
-@@ -15,7 +15,7 @@ |
42 |
- release_hdr := $(shell sh -c './mkreleasehdr.sh') |
43 |
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
44 |
- OPTIMIZATION?=-O2 |
45 |
--DEPENDENCY_TARGETS=hiredis linenoise lua geohash-int |
46 |
-+DEPENDENCY_TARGETS=hiredis linenoise geohash-int |
47 |
- |
48 |
- # Default settings |
49 |
- STD=-std=c99 -pedantic -DREDIS_STATIC='' |
50 |
-@@ -56,6 +56,7 @@ endif |
51 |
- FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -I../deps/geohash-int |
52 |
- FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) |
53 |
- FINAL_LIBS=-lm |
54 |
-+FINAL_LIBS+=@LUA_LIBS@ |
55 |
- DEBUG=-g -ggdb |
56 |
- |
57 |
- ifeq ($(uname_S),SunOS) |
58 |
-@@ -80,7 +81,7 @@ endif |
59 |
- endif |
60 |
- endif |
61 |
- # Include paths to dependencies |
62 |
--FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src |
63 |
-+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise @LUA_CFLAGS@ |
64 |
- |
65 |
- ifeq ($(MALLOC),tcmalloc) |
66 |
- FINAL_CFLAGS+= -DUSE_TCMALLOC |
67 |
-@@ -118,6 +119,7 @@ endif |
68 |
- REDIS_SERVER_NAME=redis-server |
69 |
- REDIS_SENTINEL_NAME=redis-sentinel |
70 |
- 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 geo.o |
71 |
-+REDIS_SERVER_OBJ+=fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o |
72 |
- REDIS_GEOHASH_OBJ=../deps/geohash-int/geohash.o ../deps/geohash-int/geohash_helper.o |
73 |
- REDIS_CLI_NAME=redis-cli |
74 |
- REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o |
75 |
-@@ -172,7 +174,7 @@ endif |
76 |
- |
77 |
- # redis-server |
78 |
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) |
79 |
-- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(REDIS_GEOHASH_OBJ) $(FINAL_LIBS) |
80 |
-+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(REDIS_GEOHASH_OBJ) $(FINAL_LIBS) |
81 |
- |
82 |
- # redis-sentinel |
83 |
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) |
84 |
|
85 |
diff --git a/dev-db/redis/files/redis-3.2.5-shared.patch b/dev-db/redis/files/redis-3.2.5-shared.patch |
86 |
deleted file mode 100644 |
87 |
index 7ebff12b519..00000000000 |
88 |
--- a/dev-db/redis/files/redis-3.2.5-shared.patch |
89 |
+++ /dev/null |
90 |
@@ -1,30 +0,0 @@ |
91 |
-diff --git a/src/Makefile b/src/Makefile |
92 |
-index fdbe36a..df224ae 100644 |
93 |
---- a/src/Makefile |
94 |
-+++ b/src/Makefile |
95 |
-@@ -26,12 +26,7 @@ PREFIX?=/usr/local |
96 |
- INSTALL_BIN=$(PREFIX)/bin |
97 |
- INSTALL=install |
98 |
- |
99 |
--# Default allocator |
100 |
--ifeq ($(uname_S),Linux) |
101 |
-- MALLOC=jemalloc |
102 |
--else |
103 |
-- MALLOC=libc |
104 |
--endif |
105 |
-+MALLOC?=jemalloc |
106 |
- |
107 |
- # Backwards compatibility for selecting an allocator |
108 |
- ifeq ($(USE_TCMALLOC),yes) |
109 |
-@@ -103,9 +98,8 @@ ifeq ($(MALLOC),tcmalloc_minimal) |
110 |
- endif |
111 |
- |
112 |
- ifeq ($(MALLOC),jemalloc) |
113 |
-- DEPENDENCY_TARGETS+= jemalloc |
114 |
-- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include |
115 |
-- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a |
116 |
-+ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE |
117 |
-+ FINAL_LIBS+= -ljemalloc -ldl |
118 |
- endif |
119 |
- |
120 |
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) |