Skip to content

Commit 1809400

Browse files
committed
Patch Redis code for ARM #2
1 parent 2a01bff commit 1809400

File tree

1 file changed

+26
-0
lines changed

1 file changed

+26
-0
lines changed

5.0/redis-5.0.5.patch

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
diff --git a/src/Makefile b/src/Makefile
2+
index 2a686492..44336b42 100644
3+
--- a/src/Makefile
4+
+++ b/src/Makefile
5+
@@ -119,7 +119,7 @@ ifeq ($(uname_S),DragonFly)
6+
else
7+
# All the other OSes (notably Linux)
8+
FINAL_LDFLAGS+= -rdynamic
9+
- FINAL_LIBS+=-ldl -pthread -lrt
10+
+ FINAL_LIBS+=-ldl -pthread -lrt -latomic
11+
endif
12+
endif
13+
endif
14+
diff --git a/src/server.h b/src/server.h
15+
index aa015fc1..81fe869f 100644
16+
--- a/src/server.h
17+
+++ b/src/server.h
18+
@@ -120,7 +120,7 @@ typedef long long mstime_t; /* millisecond time type. */
19+
#define CONFIG_DEFAULT_DAEMONIZE 0
20+
#define CONFIG_DEFAULT_UNIX_SOCKET_PERM 0
21+
#define CONFIG_DEFAULT_TCP_KEEPALIVE 300
22+
-#define CONFIG_DEFAULT_PROTECTED_MODE 1
23+
+#define CONFIG_DEFAULT_PROTECTED_MODE 0
24+
#define CONFIG_DEFAULT_LOGFILE ""
25+
#define CONFIG_DEFAULT_SYSLOG_ENABLED 0
26+
#define CONFIG_DEFAULT_STOP_WRITES_ON_BGSAVE_ERROR 1

0 commit comments

Comments
 (0)