You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
61 lines
2.0 KiB
61 lines
2.0 KiB
Index: deps/Makefile |
|
--- deps/Makefile.orig 2017-07-14 13:28:42.000000000 +0200 |
|
+++ deps/Makefile 2017-07-14 17:32:58.111948000 +0200 |
|
@@ -58,7 +58,7 @@ |
|
LUA_CFLAGS= -D__C99FEATURES__=1 |
|
endif |
|
|
|
-LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS) |
|
+LUA_CFLAGS+= -O2 -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS) |
|
LUA_LDFLAGS+= $(LDFLAGS) |
|
# lua's Makefile defines AR="ar rcu", which is unusual, and makes it more |
|
# challenging to cross-compile lua (and redis). These defines make it easier |
|
Index: deps/hiredis/net.h |
|
--- deps/hiredis/net.h.orig 2017-07-14 13:28:42.000000000 +0200 |
|
+++ deps/hiredis/net.h 2017-07-14 17:35:36.171112000 +0200 |
|
@@ -37,7 +37,7 @@ |
|
|
|
#include "hiredis.h" |
|
|
|
-#if defined(__sun) |
|
+#if defined(__sun) || defined(__FreeBSD__) |
|
#define AF_LOCAL AF_UNIX |
|
#endif |
|
|
|
Index: deps/linenoise/Makefile |
|
--- deps/linenoise/Makefile.orig 2017-07-14 13:28:42.000000000 +0200 |
|
+++ deps/linenoise/Makefile 2017-07-14 17:32:58.112076000 +0200 |
|
@@ -1,6 +1,6 @@ |
|
STD= |
|
-WARN= -Wall |
|
-OPT= -Os |
|
+WARN= |
|
+OPT= |
|
|
|
R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) |
|
R_LDFLAGS= $(LDFLAGS) |
|
Index: src/Makefile |
|
--- src/Makefile.orig 2017-07-14 13:28:42.000000000 +0200 |
|
+++ src/Makefile 2017-07-14 17:32:58.112216000 +0200 |
|
@@ -20,8 +20,8 @@ |
|
NODEPS:=clean distclean |
|
|
|
# Default settings |
|
-STD=-std=c99 -pedantic -DREDIS_STATIC='' |
|
-WARN=-Wall -W -Wno-missing-field-initializers |
|
+STD=-std=c99 -DREDIS_STATIC='' |
|
+WARN=-Wno-missing-field-initializers |
|
OPT=$(OPTIMIZATION) |
|
|
|
PREFIX?=/usr/local |
|
Index: src/mkreleasehdr.sh |
|
--- src/mkreleasehdr.sh.orig 2017-07-14 13:28:42.000000000 +0200 |
|
+++ src/mkreleasehdr.sh 2017-07-14 17:32:58.112322000 +0200 |
|
@@ -1,6 +1,6 @@ |
|
#!/bin/sh |
|
GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1` |
|
-GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l` |
|
+GIT_DIRTY=`(git diff --no-ext-diff) 2>/dev/null | wc -l` |
|
BUILD_ID=`uname -n`"-"`date +%s` |
|
test -f release.h || touch release.h |
|
(cat release.h | grep SHA1 | grep $GIT_SHA1) && \
|
|
|