diff options
Diffstat (limited to 'src-makefile.patch')
-rw-r--r-- | src-makefile.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/src-makefile.patch b/src-makefile.patch new file mode 100644 index 000000000000..0950a859b043 --- /dev/null +++ b/src-makefile.patch @@ -0,0 +1,71 @@ +--- src/makefile 2013-09-25 05:38:42.000000000 -0600 ++++ src/makefile.new 2017-12-07 17:25:32.723333335 -0700 +@@ -27,12 +27,12 @@ + LIBNAME=libzlog + + ZLOG_MAJOR=1 +-ZLOG_MINOR=1 ++ZLOG_MINOR=2 + + # Fallback to gcc when $CC is not in $PATH. + CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') + OPTIMIZATION?=-O2 +-WARNINGS=-Wall -Werror -Wstrict-prototypes -fwrapv ++WARNINGS=-Wall -Wstrict-prototypes -fwrapv + DEBUG?= -g -ggdb + REAL_CFLAGS=$(OPTIMIZATION) -fPIC -pthread $(CFLAGS) $(WARNINGS) $(DEBUG) + REAL_LDFLAGS=$(LDFLAGS) -pthread +@@ -46,6 +46,15 @@ + STLIBNAME=$(LIBNAME).$(STLIBSUFFIX) + STLIB_MAKE_CMD=ar rcs $(STLIBNAME) + ++# Installation related variables ++PREFIX?=/usr/local ++INCLUDE_PATH=include ++LIBRARY_PATH=lib ++BINARY_PATH=bin ++INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH) ++INSTALL_LIBRARY_PATH= $(PREFIX)/$(LIBRARY_PATH) ++INSTALL_BINARY_PATH= $(PREFIX)/$(BINARY_PATH) ++ + # Platform-specific overrides + uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') + ifeq ($(uname_S),SunOS) +@@ -55,9 +64,9 @@ + endif + ifeq ($(uname_S),Darwin) + DYLIBSUFFIX=dylib +- DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(DYLIBSUFFIX) +- DYLIB_MAJOR_NAME=$(LIBNAME).$(HIREDIS_MAJOR).$(DYLIBSUFFIX) +- DYLIB_MAKE_CMD=$(CC) -shared -Wl,-install_name,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS) ++ DYLIB_MINOR_NAME=$(LIBNAME).$(ZLOG_MAJOR).$(ZLOG_MINOR).$(DYLIBSUFFIX) ++ DYLIB_MAJOR_NAME=$(LIBNAME).$(ZLOG_MAJOR).$(DYLIBSUFFIX) ++ DYLIB_MAKE_CMD=$(CC) -dynamiclib -install_name $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS) + endif + + ifeq ($(uname_S),AIX) +@@ -145,12 +154,7 @@ + dep: + $(CC) -MM *.c + +-# Installation related variables and target +-PREFIX?=/usr/local +-INCLUDE_PATH?=include +-LIBRARY_PATH?=lib +-INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH) +-INSTALL_LIBRARY_PATH= $(PREFIX)/$(LIBRARY_PATH) ++# Installation target + + ifeq ($(uname_S),SunOS) + INSTALL?= cp -r +@@ -164,8 +168,9 @@ + INSTALL?= cp -a + + install: $(DYLIBNAME) $(STLIBNAME) +- mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH) ++ mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH) $(INSTALL_BINARY_PATH) + $(INSTALL) zlog.h $(INSTALL_INCLUDE_PATH) ++ $(INSTALL) zlog-chk-conf $(INSTALL_BINARY_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) |