]> git.pld-linux.org Git - packages/hiredis.git/blob - link.patch
- adjusted link patch to fix soname and use (preferred) direct and .so symlink
[packages/hiredis.git] / link.patch
1 --- hiredis-0.11.0/Makefile.orig        2013-12-12 17:28:25.817204756 +0100
2 +++ hiredis-0.11.0/Makefile     2013-12-12 17:33:18.150525821 +0100
3 @@ -23,7 +23,7 @@
4  DYLIB_MINOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR).$(HIREDIS_MINOR)
5  DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR)
6  DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
7 -DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
8 +DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MAJOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
9  STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
10  STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
11  
12 @@ -76,8 +76,8 @@
13         $(CC) -o $@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I$(AE_DIR) $(AE_DIR)/ae.o $(AE_DIR)/zmalloc.o example-ae.c $(STLIBNAME)
14  endif
15  
16 -hiredis-%: %.o $(STLIBNAME)
17 -       $(CC) -o $@ $(REAL_LDFLAGS) $< $(STLIBNAME)
18 +hiredis-%: %.o $(DYLIBNAME)
19 +       $(CC) -o $@ $(REAL_LDFLAGS) $< -l$(subst lib,,$(LIBNAME))
20  
21  test: hiredis-test
22         ./hiredis-test
23 @@ -121,7 +121,7 @@
24         $(INSTALL) hiredis.h async.h adapters $(INSTALL_INCLUDE_PATH)
25         $(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
26         cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
27 -       cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME)
28 +       cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIBNAME)
29         $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
30  
31  32bit:
This page took 0.093978 seconds and 3 git commands to generate.