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.
39 lines
1.3 KiB
39 lines
1.3 KiB
7 years ago
|
Index: src/Makefile
|
||
|
|
--- src/Makefile.orig 2019-02-24 00:15:26.000000000 +0100
|
||
|
|
+++ src/Makefile 2019-02-24 00:19:07.499269000 +0100
|
||
|
|
@@ -12,17 +12,11 @@
|
||
|
|
endif
|
||
|
|
|
||
|
|
# Default CFLAGS
|
||
|
|
-CFLAGS= -pg -no-pie -lprofiler -Wall -Wno-unused-function -Wno-unused-variable -Wno-unused-result -fPIC \
|
||
|
|
+CFLAGS= -Wno-unused-function -Wno-unused-variable -Wno-unused-result -fPIC \
|
||
|
|
-D_GNU_SOURCE -std=gnu99 -I"$(shell pwd)" -DREDISMODULE_EXPERIMENTAL_API
|
||
|
|
-CFLAGS += $(DEBUGFLAGS)
|
||
|
|
|
||
|
|
# Compile flags for linux / osx
|
||
|
|
-ifeq ($(uname_S),Linux)
|
||
|
|
- SHOBJ_LDFLAGS ?= -shared -Bsymbolic -Bsymbolic-functions -ldl -lpthread -lprofiler
|
||
|
|
-else
|
||
|
|
- CFLAGS += -mmacosx-version-min=10.6
|
||
|
|
- SHOBJ_LDFLAGS ?= -macosx_version_min 10.6 -exported_symbol _RedisModule_OnLoad -bundle -undefined dynamic_lookup -ldl -lpthread
|
||
|
|
-endif
|
||
|
|
+SHOBJ_LDFLAGS ?= -shared
|
||
|
|
export CFLAGS
|
||
|
|
|
||
|
|
|
||
|
|
Index: src/rmutil/sdsalloc.h
|
||
|
|
--- src/rmutil/sdsalloc.h.orig 2019-02-24 00:15:26.000000000 +0100
|
||
|
|
+++ src/rmutil/sdsalloc.h 2019-02-24 00:20:22.233560000 +0100
|
||
|
|
@@ -36,11 +36,7 @@
|
||
|
|
* the include of your alternate allocator if needed (not needed in order
|
||
|
|
* to use the default libc allocator). */
|
||
|
|
|
||
|
|
-#if defined(__MACH__)
|
||
|
|
#include <stdlib.h>
|
||
|
|
-#else
|
||
|
|
-#include <malloc.h>
|
||
|
|
-#endif
|
||
|
|
//#include "zmalloc.h"
|
||
|
|
#define s_malloc malloc
|
||
|
|
#define s_realloc realloc
|