diff options
Diffstat (limited to 'dev-libs/hiredis/files')
4 files changed, 43 insertions, 47 deletions
diff --git a/dev-libs/hiredis/files/hiredis-0.13.3-disable-network-tests.patch b/dev-libs/hiredis/files/hiredis-0.13.3-disable-network-tests.patch deleted file mode 100644 index 000e2537b5a0..000000000000 --- a/dev-libs/hiredis/files/hiredis-0.13.3-disable-network-tests.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git test.c test.c -index 8fde554..89ed6a0 100644 ---- a/test.c -+++ b/test.c -@@ -343,6 +343,7 @@ static void test_free_null(void) { - static void test_blocking_connection_errors(void) { - redisContext *c; - -+#if 0 - test("Returns error when host cannot be resolved: "); - c = redisConnect((char*)"idontexist.test", 6379); - test_cond(c->err == REDIS_ERR_OTHER && -@@ -353,6 +354,7 @@ static void test_blocking_connection_errors(void) { - strcmp(c->errstr,"Temporary failure in name resolution") == 0 || - strcmp(c->errstr,"no address associated with name") == 0)); - redisFree(c); -+#endif - - test("Returns error when the port is not open: "); - c = redisConnect((char*)"localhost", 1); -@@ -773,6 +775,7 @@ int main(int argc, char **argv) { - test_blocking_connection_errors(); - test_free_null(); - -+#if 0 - printf("\nTesting against TCP connection (%s:%d):\n", cfg.tcp.host, cfg.tcp.port); - cfg.type = CONN_TCP; - test_blocking_connection(cfg); -@@ -781,6 +784,7 @@ int main(int argc, char **argv) { - test_invalid_timeout_errors(cfg); - test_append_formatted_commands(cfg); - if (throughput) test_throughput(cfg); -+#endif - - printf("\nTesting against Unix socket connection (%s):\n", cfg.unix.path); - cfg.type = CONN_UNIX; diff --git a/dev-libs/hiredis/files/hiredis-0.14.1-honor-AR.patch b/dev-libs/hiredis/files/hiredis-0.14.1-honor-AR.patch deleted file mode 100644 index 0bfcf0988e81..000000000000 --- a/dev-libs/hiredis/files/hiredis-0.14.1-honor-AR.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -51,7 +51,7 @@ DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR) - DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX) - DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS) - STLIBNAME=$(LIBNAME).$(STLIBSUFFIX) --STLIB_MAKE_CMD=ar rcs $(STLIBNAME) -+STLIB_MAKE_CMD=$(AR) rcs $(STLIBNAME) - - # Platform-specific overrides - uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') diff --git a/dev-libs/hiredis/files/hiredis-1.1.0-disable-network-tests.patch b/dev-libs/hiredis/files/hiredis-1.1.0-disable-network-tests.patch new file mode 100644 index 000000000000..0bfc281757f8 --- /dev/null +++ b/dev-libs/hiredis/files/hiredis-1.1.0-disable-network-tests.patch @@ -0,0 +1,19 @@ +Gentoo specific patch which disables test requiring non-localhost IP +address. + +diff --git a/test.c b/test.c +index c1065ff..ca21c30 100644 +--- a/test.c ++++ b/test.c +@@ -2151,7 +2151,7 @@ static void test_async_polling(struct config config) { + assert(astest.ac == NULL); + test_cond(astest.disconnect_status == REDIS_OK); + +- if (config.type == CONN_TCP || config.type == CONN_SSL) { ++ if (0) { /* disabled because of blackhole ip */ + /* timeout can only be simulated with network */ + test("Async connect timeout: "); + config.tcp.host = "192.168.254.254"; /* blackhole ip */ +-- +2.43.2 + diff --git a/dev-libs/hiredis/files/hiredis-1.2.0-conditional-werror.patch b/dev-libs/hiredis/files/hiredis-1.2.0-conditional-werror.patch new file mode 100644 index 000000000000..2ab7cf86e089 --- /dev/null +++ b/dev-libs/hiredis/files/hiredis-1.2.0-conditional-werror.patch @@ -0,0 +1,24 @@ +From bff171c9fc83f8abed9a283a3da2dc91a5671419 Mon Sep 17 00:00:00 2001 +From: Romain Geissler <romain.geissler@amadeus.com> +Date: Thu, 13 Jul 2023 12:39:45 +0000 +Subject: [PATCH] Allow disabling the -Werror flag. + +Upstream-commit: https://github.com/redis/hiredis/commit/bff171c9fc83f8abed9a283a3da2dc91a5671419 + +diff --git a/Makefile b/Makefile +index bd2106b1d..56e3d59be 100644 +--- a/Makefile ++++ b/Makefile +@@ -39,7 +39,11 @@ export REDIS_TEST_CONFIG + CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') + CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') + OPTIMIZATION?=-O3 +-WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers ++WARNINGS=-Wall -Wextra -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers ++USE_WERROR?=1 ++ifeq ($(USE_WERROR),1) ++ WARNINGS+=-Werror ++endif + DEBUG_FLAGS?= -g -ggdb + REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS) + REAL_LDFLAGS=$(LDFLAGS) |