up to 1.1.0

[packages/hiredis.git] / link.patch

diff --git a/link.patch b/link.patch
index 2c76ac31e23743c9e93857f1ac8b2ec9d263cb24..cb5e3e533f3e8e883507dc7c513faf26e5bf41ea 100644 (file)
--- a/link.patch
+++ b/link.patch
@@ -1,23 +1,20 @@
 --- hiredis-1.0.0/Makefile.orig        2020-08-03 20:18:07.000000000 +0200
 +++ hiredis-1.0.0/Makefile     2020-09-05 09:50:31.097913070 +0200
 @@ -127,7 +127,7 @@
-       $(STLIB_MAKE_CMD) $(STLIBNAME) $(OBJ)
  
+ #################### SSL building rules start ####################
  $(SSL_DYLIBNAME): $(SSL_OBJ)
 -      $(SSL_DYLIB_MAKE_CMD) $(DYLIB_PLUGIN) -o $(SSL_DYLIBNAME) $(SSL_OBJ) $(REAL_LDFLAGS) $(LDFLAGS) $(SSL_LDFLAGS)
 +      $(SSL_DYLIB_MAKE_CMD) $(DYLIB_PLUGIN) -o $(SSL_DYLIBNAME) $(SSL_OBJ) $(DYLIBNAME) $(REAL_LDFLAGS) $(LDFLAGS) $(SSL_LDFLAGS)
  
  $(SSL_STLIBNAME): $(SSL_OBJ)
        $(STLIB_MAKE_CMD) $(SSL_STLIBNAME) $(SSL_OBJ)
-@@ -201,9 +201,9 @@
+@@ -201,7 +201,7 @@
  
  examples: $(EXAMPLES)
  
--TEST_LIBS = $(STLIBNAME)
-+TEST_LIBS = $(DYLIBNAME)
+-TEST_LIBS = $(STLIBNAME) $(SSL_STLIB)
++TEST_LIBS = $(DYLIBNAME) $(SSL_DYLIB)
+ TEST_LDFLAGS = $(SSL_LDFLAGS)
  ifeq ($(USE_SSL),1)
--    TEST_LIBS += $(SSL_STLIBNAME)
-+    TEST_LIBS += $(SSL_DYLIBNAME)
-     TEST_LDFLAGS = $(SSL_LDFLAGS) -lssl -lcrypto -lpthread
- endif
- 
+   TEST_LDFLAGS += -pthread