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.
 
 
 
 
 
 

69 lines
2.3 KiB

Index: deps/Makefile
--- deps/Makefile.orig 2021-03-02 07:14:39.000000000 +0100
+++ deps/Makefile 2021-03-02 23:51:51.500611000 +0100
@@ -69,7 +69,7 @@
LUA_CFLAGS= -D__C99FEATURES__=1
endif
-LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS)
+LUA_CFLAGS+= -O2 -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(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/linenoise/Makefile
--- deps/linenoise/Makefile.orig 2021-03-02 07:14:39.000000000 +0100
+++ deps/linenoise/Makefile 2021-03-02 23:51:51.500776000 +0100
@@ -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 2021-03-02 23:51:51.501051000 +0100
+++ src/Makefile 2021-03-03 08:22:13.497511000 +0100
@@ -20,7 +20,7 @@
NODEPS:=clean distclean
# Default settings
-STD=-pedantic -DREDIS_STATIC=''
+STD=-DREDIS_STATIC=''
# Use -Wno-c11-extensions on clang, either where explicitly used or on
# platforms we can assume it's being used.
@@ -31,7 +31,7 @@
STD+=-Wno-c11-extensions
endif
endif
-WARN=-Wall -W -Wno-missing-field-initializers
+WARN=-Wno-missing-field-initializers
OPT=$(OPTIMIZATION)
# Detect if the compiler supports C11 _Atomic
Index: src/mkreleasehdr.sh
--- src/mkreleasehdr.sh.orig 2021-03-02 07:14:39.000000000 +0100
+++ src/mkreleasehdr.sh 2021-03-02 23:51:51.501328000 +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`
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)
Index: src/zmalloc.c
--- src/zmalloc.c.orig 2021-03-02 07:14:39.000000000 +0100
+++ src/zmalloc.c 2021-03-02 23:51:51.501630000 +0100
@@ -30,6 +30,9 @@
#include <stdio.h>
#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <sys/types.h>
#include <stdint.h>
#include <unistd.h>
#include <assert.h>