diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2012-11-22 18:21:12 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2012-11-22 18:21:12 +0000 |
| commit | a00ccece1b929f54a7205ad8c412c3da2f0f5375 (patch) | |
| tree | 58979d4627d540030ca55967f244656955f7a820 /databases/redis/files/patch-deps::hiredis::Makefile | |
| parent | Update from 2.6.4 to 2.6.5. (diff) | |
Use more canonical names for patches.
No functionaly changes.
Don't bump PORTREVISION.
Feature safe: yes
Diffstat (limited to 'databases/redis/files/patch-deps::hiredis::Makefile')
| -rw-r--r-- | databases/redis/files/patch-deps::hiredis::Makefile | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/databases/redis/files/patch-deps::hiredis::Makefile b/databases/redis/files/patch-deps::hiredis::Makefile deleted file mode 100644 index b0cfcd406885..000000000000 --- a/databases/redis/files/patch-deps::hiredis::Makefile +++ /dev/null @@ -1,41 +0,0 @@ ---- deps/hiredis/Makefile.orig 2012-02-22 17:23:43.000000000 +0400 -+++ deps/hiredis/Makefile 2012-02-24 16:46:44.000000000 +0400 -@@ -12,10 +12,10 @@ - - # 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?=-O3 -+#OPTIMIZATION?=-O3 - WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings --DEBUG?= -g -ggdb --REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH) -+#DEBUG?= -g -ggdb -+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) - REAL_LDFLAGS=$(LDFLAGS) $(ARCH) - - DYLIBSUFFIX=so -@@ -34,6 +34,15 @@ - DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS) - INSTALL= cp -r - endif -+ifeq ($(uname_S),FreeBSD) -+ CFLAGS?=$(CFLAGS) -+ CCLINK?=-pthread -+ LDFLAGS?=-L. -Wl,-rpath,. -+ DYLIBNAME?=libhiredis.so -+ DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ} -+ STLIBNAME?=libhiredis.a -+ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ} -+endif - ifeq ($(uname_S),Darwin) - DYLIBSUFFIX=dylib - DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(DYLIBSUFFIX) -@@ -104,7 +113,7 @@ - $(CC) -MM *.c - - # Installation related variables and target --PREFIX?=/usr/local -+PREFIX?=${PREFIX} - INCLUDE_PATH?=include/hiredis - LIBRARY_PATH?=lib - INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH) |