From 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Mar 2019 13:42:34 +0000 Subject: gentoo resync : 03.03.2019 --- dev-db/redis/Manifest | 2 - dev-db/redis/files/redis-3.2.3-sharedlua.patch | 60 -------------------------- dev-db/redis/files/redis-3.2.5-shared.patch | 30 ------------- 3 files changed, 92 deletions(-) delete mode 100644 dev-db/redis/files/redis-3.2.3-sharedlua.patch delete mode 100644 dev-db/redis/files/redis-3.2.5-shared.patch (limited to 'dev-db/redis') diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index a4d2e5209d1f..6ea50dc11217 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -1,7 +1,5 @@ AUX configure.ac-3.2 1882 BLAKE2B b8bc3e04c3203977218ee1d6d68e9f841b84fe82ab8803027034237275fb548cde282748a2f96bc25532e61f8e25a50cba9e165aac578d5db634a7ffc587ee9e SHA512 13d9f16cde8a95c96bcd726056d670d390dea6e2752ac607bc68eefb6214f0ab18b0e27d3283f2b219febd2da82e6489bd434215c9380c3c85c711aa00cb2be5 AUX redis-3.2.3-config.patch 1495 BLAKE2B 9f3c04dfd97845dcd364b75e2e5f543bc40ec0221a5ce19ab3c194e55ceaf24f13c307276f616d9a7742662d9e4fa76152c7036f7728f787bbac55f2b1a00999 SHA512 d71c918ea4952ecb55cc4c87649745ee468587c289d60bd1bee87a2948a6e882d42afe36bb113392b5aaab17d315732cabfc472804204d3a043305a5488a4124 -AUX redis-3.2.3-sharedlua.patch 2535 BLAKE2B 4affacfc27ee228f5050eb9133bee892b91690589a5b5885ad828f8cf408486bf9e2e4830eea8baf66feacd36bde56a565d54aebacb857215b1b76e0ef01ab39 SHA512 4b60271a24a27f69292450575f9316dd009e154980db2b70d7035794bc1f332fe54957558037c75de625d1eaf98cc0f1ec02fcd0ef510c86a3c605c474c1117e -AUX redis-3.2.5-shared.patch 754 BLAKE2B cb119c20e219ab7c38bceffa9f7b3e59dc4eafe49bf28c652793c24044065a2de1c07e94baa24e9ba7e45840daf7d926667214e6ec468a99ac4637337949d6b5 SHA512 dcb0755a0cc24b4dc21c7a20891df5fa0c643beb8f411779548893ac9681c41510ecba79b0ba031d7eeeccbf5b15ae32be04241b197524de4f8f9aafa02ccaab 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 diff --git a/dev-db/redis/files/redis-3.2.3-sharedlua.patch b/dev-db/redis/files/redis-3.2.3-sharedlua.patch deleted file mode 100644 index 52de9048463f..000000000000 --- a/dev-db/redis/files/redis-3.2.3-sharedlua.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/deps/lua/src/lua_cjson.c b/deps/lua/src/lua_cjson.c -index c26c0d7..fa50c41 100644 ---- a/deps/lua/src/lua_cjson.c -+++ b/deps/lua/src/lua_cjson.c -@@ -46,7 +46,7 @@ - #include "strbuf.h" - #include "fpconv.h" - --#include "../../../src/solarisfixes.h" -+#include "solarisfixes.h" - - #ifndef CJSON_MODNAME - #define CJSON_MODNAME "cjson" -diff --git a/src/Makefile b/src/Makefile -index 648127a..1f96d98 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -15,7 +15,7 @@ - release_hdr := $(shell sh -c './mkreleasehdr.sh') - uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') - OPTIMIZATION?=-O2 --DEPENDENCY_TARGETS=hiredis linenoise lua geohash-int -+DEPENDENCY_TARGETS=hiredis linenoise geohash-int - - # Default settings - STD=-std=c99 -pedantic -DREDIS_STATIC='' -@@ -56,6 +56,7 @@ endif - FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -I../deps/geohash-int - FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) - FINAL_LIBS=-lm -+FINAL_LIBS+=@LUA_LIBS@ - DEBUG=-g -ggdb - - ifeq ($(uname_S),SunOS) -@@ -80,7 +81,7 @@ endif - endif - endif - # Include paths to dependencies --FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise @LUA_CFLAGS@ - - ifeq ($(MALLOC),tcmalloc) - FINAL_CFLAGS+= -DUSE_TCMALLOC -@@ -118,6 +119,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 geo.o -+REDIS_SERVER_OBJ+=fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o - REDIS_GEOHASH_OBJ=../deps/geohash-int/geohash.o ../deps/geohash-int/geohash_helper.o - REDIS_CLI_NAME=redis-cli - REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o -@@ -172,7 +174,7 @@ endif - - # redis-server - $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) -- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(REDIS_GEOHASH_OBJ) $(FINAL_LIBS) -+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(REDIS_GEOHASH_OBJ) $(FINAL_LIBS) - - # redis-sentinel - $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) diff --git a/dev-db/redis/files/redis-3.2.5-shared.patch b/dev-db/redis/files/redis-3.2.5-shared.patch deleted file mode 100644 index 7ebff12b5196..000000000000 --- a/dev-db/redis/files/redis-3.2.5-shared.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index fdbe36a..df224ae 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -26,12 +26,7 @@ PREFIX?=/usr/local - INSTALL_BIN=$(PREFIX)/bin - INSTALL=install - --# Default allocator --ifeq ($(uname_S),Linux) -- MALLOC=jemalloc --else -- MALLOC=libc --endif -+MALLOC?=jemalloc - - # Backwards compatibility for selecting an allocator - ifeq ($(USE_TCMALLOC),yes) -@@ -103,9 +98,8 @@ ifeq ($(MALLOC),tcmalloc_minimal) - endif - - ifeq ($(MALLOC),jemalloc) -- DEPENDENCY_TARGETS+= jemalloc -- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include -- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -+ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -+ FINAL_LIBS+= -ljemalloc -ldl - endif - - REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) -- cgit v1.2.3