|
|
|
|
@ -1,6 +1,6 @@
|
|
|
|
|
Index: deps/Makefile
|
|
|
|
|
--- deps/Makefile.orig 2017-07-14 13:28:42.000000000 +0200
|
|
|
|
|
+++ deps/Makefile 2017-07-14 17:32:58.111948000 +0200
|
|
|
|
|
--- deps/Makefile.orig 2018-11-22 11:26:38.000000000 +0100
|
|
|
|
|
+++ deps/Makefile 2018-11-23 08:44:12.684882000 +0100
|
|
|
|
|
@@ -58,7 +58,7 @@
|
|
|
|
|
LUA_CFLAGS= -D__C99FEATURES__=1
|
|
|
|
|
endif
|
|
|
|
|
@ -11,8 +11,8 @@ Index: deps/Makefile
|
|
|
|
|
# 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
|
|
|
|
|
--- deps/hiredis/net.h.orig 2018-11-22 11:26:38.000000000 +0100
|
|
|
|
|
+++ deps/hiredis/net.h 2018-11-23 08:44:12.685261000 +0100
|
|
|
|
|
@@ -37,7 +37,7 @@
|
|
|
|
|
|
|
|
|
|
#include "hiredis.h"
|
|
|
|
|
@ -23,8 +23,8 @@ Index: deps/hiredis/net.h
|
|
|
|
|
#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
|
|
|
|
|
--- deps/linenoise/Makefile.orig 2018-11-22 11:26:38.000000000 +0100
|
|
|
|
|
+++ deps/linenoise/Makefile 2018-11-23 08:44:12.685597000 +0100
|
|
|
|
|
@@ -1,6 +1,6 @@
|
|
|
|
|
STD=
|
|
|
|
|
-WARN= -Wall
|
|
|
|
|
@ -35,27 +35,32 @@ Index: deps/linenoise/Makefile
|
|
|
|
|
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 @@
|
|
|
|
|
--- src/Makefile.orig 2018-11-23 08:44:12.685944000 +0100
|
|
|
|
|
+++ src/Makefile 2018-11-23 08:46:07.455418000 +0100
|
|
|
|
|
@@ -20,13 +20,13 @@
|
|
|
|
|
NODEPS:=clean distclean
|
|
|
|
|
|
|
|
|
|
# Default settings
|
|
|
|
|
-STD=-std=c99 -pedantic -DREDIS_STATIC=''
|
|
|
|
|
-WARN=-Wall -W -Wno-missing-field-initializers
|
|
|
|
|
+STD=-std=c99 -DREDIS_STATIC=''
|
|
|
|
|
ifneq (,$(findstring clang,$(CC)))
|
|
|
|
|
ifneq (,$(findstring FreeBSD,$(uname_S)))
|
|
|
|
|
STD+=-Wno-c11-extensions
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
-WARN=-Wall -W -Wno-missing-field-initializers
|
|
|
|
|
+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
|
|
|
|
|
--- src/mkreleasehdr.sh.orig 2018-11-22 11:26:38.000000000 +0100
|
|
|
|
|
+++ src/mkreleasehdr.sh 2018-11-23 08:44:12.686333000 +0100
|
|
|
|
|
@@ -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) && \
|
|
|
|
|
if [ -n "$SOURCE_DATE_EPOCH" ]; then
|
|
|
|
|
BUILD_ID=$(date -u -d "@$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u %s)
|
|
|
|
|
|
