diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2011-02-13 12:25:02 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2011-02-13 12:25:02 +0000 |
| commit | 69f903759a994ca53d4e65f97ca7eb15c56f8d8f (patch) | |
| tree | 8ee257702429b84ddacd0b1dd76edb0cda670aac /databases/redis/files/patch-src::Makefile | |
| parent | Add CONFLICTS with upcoming redis-2.2. (diff) | |
Update from 2.0.4 (after repocopy to databases/redis2) to latest
release candidate 2.2.rc4.
Add CONFLICTS with redis-2.0.
Add NO_LATEST_LINK, should be removed after 2.2 release.
Notes
Notes:
svn path=/head/; revision=269065
Diffstat (limited to 'databases/redis/files/patch-src::Makefile')
| -rw-r--r-- | databases/redis/files/patch-src::Makefile | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/databases/redis/files/patch-src::Makefile b/databases/redis/files/patch-src::Makefile new file mode 100644 index 000000000000..21674a4798b2 --- /dev/null +++ b/databases/redis/files/patch-src::Makefile @@ -0,0 +1,24 @@ +--- src/Makefile.orig 2010-12-24 09:29:14.000000000 +0300 ++++ src/Makefile 2010-12-24 09:31:51.000000000 +0300 +@@ -9,6 +9,9 @@ + CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6 + CCLINK?= -ldl -lnsl -lsocket -lm -lpthread + DEBUG?= -g -ggdb ++else ifeq ($(uname_S),FreeBSD) ++ CFLAGS?= $(CFLAGS) ++ CCLINK?= -pthread -lm + else + CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF) + CCLINK?= -lm -pthread +@@ -19,9 +22,9 @@ + CCLINK+= -ltcmalloc + CFLAGS+= -DUSE_TCMALLOC + endif +-CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF) ++CCOPT= $(CFLAGS) $(CCLINK) $(PROF) + +-PREFIX= /usr/local ++PREFIX?= $(PREFIX) + INSTALL_BIN= $(PREFIX)/bin + INSTALL= cp -p + |