redis.patch 1.2 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. Index: src/Makefile
  2. --- src/Makefile.orig 2011-11-28 11:22:08.000000000 +0100
  3. +++ src/Makefile 2011-11-28 19:42:28.000000000 +0100
  4. @@ -25,11 +25,11 @@
  5. endif
  6. ifeq ($(uname_S),SunOS)
  7. - CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6
  8. + CFLAGS?=-std=c99 $(OPTIMIZATION) -D__EXTENSIONS__ -D_XPG6
  9. CCLINK?=-ldl -lnsl -lsocket -lm -lpthread
  10. DEBUG?=-g -ggdb
  11. else
  12. - CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
  13. + CFLAGS?=-std=c99 $(OPTIMIZATION) $(ARCH) $(PROF)
  14. CCLINK?=-lm -pthread
  15. DEBUG?=-g -rdynamic -ggdb
  16. endif
  17. @@ -205,7 +205,7 @@
  18. ./redis-benchmark
  19. log:
  20. - git log '--pretty=format:%ad %s (%cn)' --date=short > ../Changelog
  21. + cat /dev/null > ../Changelog
  22. 32bit:
  23. @echo ""
  24. Index: src/mkreleasehdr.sh
  25. --- src/mkreleasehdr.sh.orig 2011-11-28 11:22:08.000000000 +0100
  26. +++ src/mkreleasehdr.sh 2011-11-28 19:42:28.000000000 +0100
  27. @@ -1,6 +1,6 @@
  28. #!/bin/sh
  29. GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
  30. -GIT_DIRTY=`git diff 2> /dev/null | wc -l`
  31. +GIT_DIRTY=`(git diff 2> /dev/null) | wc -l`
  32. test -f release.h || touch release.h
  33. (cat release.h | grep SHA1 | grep $GIT_SHA1) && \
  34. (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already uptodate