1 |
commit: d7a53e854bc6aa14751eb3625b3ae6e64a1431fe |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Nov 20 17:23:35 2020 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 20 23:04:41 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7a53e85 |
7 |
|
8 |
dev-db/redis: remove unused patch |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/18338 |
11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
12 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
14 |
|
15 |
dev-db/redis/files/redis-6.0.3-sharedlua.patch | 60 -------------------------- |
16 |
1 file changed, 60 deletions(-) |
17 |
|
18 |
diff --git a/dev-db/redis/files/redis-6.0.3-sharedlua.patch b/dev-db/redis/files/redis-6.0.3-sharedlua.patch |
19 |
deleted file mode 100644 |
20 |
index 20df7983d7a..00000000000 |
21 |
--- a/dev-db/redis/files/redis-6.0.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 b8c05c3..e5a7cc2 100644 |
39 |
---- a/src/Makefile |
40 |
-+++ b/src/Makefile |
41 |
-@@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh') |
42 |
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
43 |
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') |
44 |
- OPTIMIZATION?=-O2 |
45 |
--DEPENDENCY_TARGETS=hiredis linenoise lua |
46 |
-+DEPENDENCY_TARGETS=hiredis linenoise |
47 |
- NODEPS:=clean distclean |
48 |
- |
49 |
- # Default settings |
50 |
-@@ -76,6 +76,7 @@ endif |
51 |
- FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) |
52 |
- FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) |
53 |
- FINAL_LIBS=-lm |
54 |
-+FINAL_LIBS+=@LUA_LIBS@ |
55 |
- DEBUG=-g -ggdb |
56 |
- |
57 |
- # Linux ARM needs -latomic at linking time |
58 |
-@@ -149,7 +150,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 |
- # Determine systemd support and/or build preference (defaulting to auto-detection) |
66 |
- BUILD_WITH_SYSTEMD=no |
67 |
-@@ -217,6 +218,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 crcspeed.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 lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o |
71 |
-+REDIS_SERVER_OBJ+=fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o |
72 |
- REDIS_CLI_NAME=redis-cli |
73 |
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o |
74 |
- REDIS_BENCHMARK_NAME=redis-benchmark |
75 |
-@@ -268,7 +270,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 $(FINAL_LIBS) |
80 |
-+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) |
81 |
- |
82 |
- # redis-sentinel |
83 |
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) |