up to 1.2.0

[packages/hiredis.git] / link.patch

diff --git a/link.patch b/link.patch
index f25be313bba7577b14e3d39e5b14dc7bc91a34d9..cb5e3e533f3e8e883507dc7c513faf26e5bf41ea 100644 (file)
--- a/link.patch
+++ b/link.patch
@@ -1,31 +1,20 @@
---- hiredis-0.13.1/Makefile.orig       2015-05-03 22:58:11.000000000 +0200
-+++ hiredis-0.13.1/Makefile    2015-06-08 18:05:58.081044826 +0200
-@@ -47,7 +47,7 @@
- DYLIB_MINOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR).$(HIREDIS_MINOR)
- 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 @@
  
-@@ -120,8 +120,8 @@
+ #################### 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)
  
- hiredis-test: test.o $(STLIBNAME)
+ $(SSL_STLIBNAME): $(SSL_OBJ)
+       $(STLIB_MAKE_CMD) $(SSL_STLIBNAME) $(SSL_OBJ)
+@@ -201,7 +201,7 @@
  
--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: hiredis-test
-       ./hiredis-test
-@@ -165,7 +165,7 @@
-       $(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_MAJOR_NAME) $(DYLIBNAME)
-+      cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIBNAME)
-       $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
-       mkdir -p $(INSTALL_PKGCONF_PATH)
-       $(INSTALL) $(PKGCONFNAME) $(INSTALL_PKGCONF_PATH)
+-TEST_LIBS = $(STLIBNAME) $(SSL_STLIB)
++TEST_LIBS = $(DYLIBNAME) $(SSL_DYLIB)
+ TEST_LDFLAGS = $(SSL_LDFLAGS)
+ ifeq ($(USE_SSL),1)
+   TEST_LDFLAGS += -pthread