- updated to 1.0.0 (note: new soname)

[packages/hiredis.git] / link.patch

diff --git a/link.patch b/link.patch
index 807a98402bb97bee82253076e473a333976510bb..2c76ac31e23743c9e93857f1ac8b2ec9d263cb24 100644 (file)
--- a/link.patch
+++ b/link.patch
@@ -1,30 +1,23 @@
---- hiredis-0.13.3/Makefile.orig       2015-09-16 12:25:02.000000000 +0200
-+++ hiredis-0.13.3/Makefile    2016-11-08 16:37:58.943150777 +0100
-@@ -49,7 +49,7 @@
- DYLIB_MINOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_SONAME)
- DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR)
- DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
--DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
-+DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MAJOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
- STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
- STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
+--- 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)
  
-@@ -140,8 +140,8 @@
+ $(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)
  
- hiredis-test: test.o $(STLIBNAME)
+ $(SSL_STLIBNAME): $(SSL_OBJ)
+       $(STLIB_MAKE_CMD) $(SSL_STLIBNAME) $(SSL_OBJ)
+@@ -201,9 +201,9 @@
  
--hiredis-%: %.o $(STLIBNAME)
--      $(CC) $(REAL_CFLAGS) -o $@ $(REAL_LDFLAGS) $< $(STLIBNAME)
-+hiredis-%: %.o $(DYLIBNAME)
-+      $(CC) $(REAL_CFLAGS) -o $@ $(REAL_LDFLAGS) $< -L. -l$(subst lib,,$(LIBNAME))
+ examples: $(EXAMPLES)
+ 
+-TEST_LIBS = $(STLIBNAME)
++TEST_LIBS = $(DYLIBNAME)
+ ifeq ($(USE_SSL),1)
+-    TEST_LIBS += $(SSL_STLIBNAME)
++    TEST_LIBS += $(SSL_DYLIBNAME)
+     TEST_LDFLAGS = $(SSL_LDFLAGS) -lssl -lcrypto -lpthread
+ endif
  
- test: hiredis-test
-       ./hiredis-test
-@@ -184,6 +184,7 @@
-       mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
-       $(INSTALL) hiredis.h async.h read.h sds.h adapters $(INSTALL_INCLUDE_PATH)
-       $(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
-+      cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
-       cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIBNAME)
-       $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
-       mkdir -p $(INSTALL_PKGCONF_PATH)