|
@@ -1,32 +1,20 @@
|
|
|
Index: src/Makefile
|
|
Index: src/Makefile
|
|
|
---- src/Makefile.orig 2011-11-28 11:22:08.000000000 +0100
|
|
|
|
|
-+++ src/Makefile 2011-11-28 19:42:28.000000000 +0100
|
|
|
|
|
-@@ -25,11 +25,11 @@
|
|
|
|
|
- endif
|
|
|
|
|
|
|
+--- src/Makefile.orig 2012-10-22 23:27:18.000000000 +0200
|
|
|
|
|
++++ src/Makefile 2012-10-23 19:43:06.000000000 +0200
|
|
|
|
|
+@@ -18,8 +18,8 @@
|
|
|
|
|
+ DEPENDENCY_TARGETS=hiredis linenoise lua
|
|
|
|
|
|
|
|
- ifeq ($(uname_S),SunOS)
|
|
|
|
|
-- CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6
|
|
|
|
|
-+ CFLAGS?=-std=c99 $(OPTIMIZATION) -D__EXTENSIONS__ -D_XPG6
|
|
|
|
|
- CCLINK?=-ldl -lnsl -lsocket -lm -lpthread
|
|
|
|
|
- DEBUG?=-g -ggdb
|
|
|
|
|
- else
|
|
|
|
|
-- CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
|
|
|
|
|
-+ CFLAGS?=-std=c99 $(OPTIMIZATION) $(ARCH) $(PROF)
|
|
|
|
|
- CCLINK?=-lm -pthread
|
|
|
|
|
- DEBUG?=-g -rdynamic -ggdb
|
|
|
|
|
- endif
|
|
|
|
|
-@@ -205,7 +205,7 @@
|
|
|
|
|
- ./redis-benchmark
|
|
|
|
|
|
|
+ # Default settings
|
|
|
|
|
+-STD= -std=c99 -pedantic
|
|
|
|
|
+-WARN= -Wall
|
|
|
|
|
++STD= -std=c99
|
|
|
|
|
++WARN=
|
|
|
|
|
+ OPT= $(OPTIMIZATION)
|
|
|
|
|
|
|
|
- log:
|
|
|
|
|
-- git log '--pretty=format:%ad %s (%cn)' --date=short > ../Changelog
|
|
|
|
|
-+ cat /dev/null > ../Changelog
|
|
|
|
|
-
|
|
|
|
|
- 32bit:
|
|
|
|
|
- @echo ""
|
|
|
|
|
|
|
+ # Default allocator
|
|
|
Index: src/mkreleasehdr.sh
|
|
Index: src/mkreleasehdr.sh
|
|
|
---- src/mkreleasehdr.sh.orig 2011-11-28 11:22:08.000000000 +0100
|
|
|
|
|
-+++ src/mkreleasehdr.sh 2011-11-28 19:42:28.000000000 +0100
|
|
|
|
|
|
|
+--- src/mkreleasehdr.sh.orig 2012-10-22 23:27:18.000000000 +0200
|
|
|
|
|
++++ src/mkreleasehdr.sh 2012-10-23 19:21:58.000000000 +0200
|
|
|
@@ -1,6 +1,6 @@
|
|
@@ -1,6 +1,6 @@
|
|
|
#!/bin/sh
|
|
#!/bin/sh
|
|
|
GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
|
|
GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
|