1*4882a593SmuzhiyunFrom 88da6b19ecd00747769663e913aba5e9569c489d Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Venture Research <tech@ventureresearch.com> 3*4882a593SmuzhiyunDate: Wed, 6 Feb 2013 20:51:02 -0600 4*4882a593SmuzhiyunSubject: [PATCH] hack to force use of libc malloc 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunHack to force libc usage as it seems the option to pass it in has been 7*4882a593Smuzhiyunremoved in favor of magic. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunNote that this of course doesn't allow tcmalloc and jemalloc, however 10*4882a593Smuzhiyunjemalloc wasn't building correctly. 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunSigned-off-by: Venture Research <tech@ventureresearch.com> 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunUpdate to work with 4.0.8 15*4882a593SmuzhiyunSigned-off-by: Alistair Francis <alistair.francis@wdc.com> 16*4882a593Smuzhiyun 17*4882a593Smuzhiyun--- 18*4882a593Smuzhiyun src/Makefile | 3 ++- 19*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 1 deletion(-) 20*4882a593Smuzhiyun 21*4882a593Smuzhiyundiff --git a/src/Makefile b/src/Makefile 22*4882a593Smuzhiyunindex 2a0d74d..ddabd44 100644 23*4882a593Smuzhiyun--- a/src/Makefile 24*4882a593Smuzhiyun+++ b/src/Makefile 25*4882a593Smuzhiyun@@ -13,7 +13,8 @@ 26*4882a593Smuzhiyun # Just use 'make dep', but this is only needed by developers. 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun release_hdr := $(shell sh -c './mkreleasehdr.sh') 29*4882a593Smuzhiyun-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') 30*4882a593Smuzhiyun+# use fake uname option to force use of generic libc 31*4882a593Smuzhiyun+uname_S := "USE_LIBC_MALLOC" 32*4882a593Smuzhiyun uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') 33*4882a593Smuzhiyun OPTIMIZATION?=-O2 34*4882a593Smuzhiyun DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram 35