From bbdf54366c9d69aaa4784571ae4d55c3a58850c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Mon, 16 Nov 2015 10:41:56 +0000 Subject: [PATCH] Further changed for FreeBSD #354 - possible bug in jemalloc when compiled with -O3 (default). Changed to -O2 - static linking of libstdc++ --- deps/Makefile | 4 ++-- src/Makefile.BSD | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/Makefile b/deps/Makefile index 4e5d794a7..0bc79c281 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -29,8 +29,8 @@ libinjection: libinjection/libinjection.a jemalloc/jemalloc/lib/libjemalloc.a: cd jemalloc && rm -rf jemalloc-3.6.0 cd jemalloc && tar -jxf jemalloc-3.6.0.tar.bz2 - cd jemalloc/jemalloc && ./configure --enable-xmalloc - cd jemalloc/jemalloc && CC=cc ${MAKE} + cd jemalloc/jemalloc && CFLAGS=-O2 ./configure --enable-xmalloc + cd jemalloc/jemalloc && CC=${CC} CXX=${CXX} ${MAKE} jemalloc: jemalloc/jemalloc/lib/libjemalloc.a diff --git a/src/Makefile.BSD b/src/Makefile.BSD index 6eee7ebfc..232de37a2 100644 --- a/src/Makefile.BSD +++ b/src/Makefile.BSD @@ -52,7 +52,7 @@ LDIRS=-L$(LDIR) -L$(JEMALLOC_LDIR) $(LIBCONFIG_LDIR) -L$(RE2_PATH)/obj -L$(INJEC CFLAGS=-std=c++11 -D_GLIBCXX_USE_C99 $(IDIRS) $(OPTZ) $(DEBUG) -LIBS=-rdynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -ljemalloc -lconfig++ -lre2 -linjection -levent -lmariadbclient -Wl,-Bdynamic -lpthread -lm -lz -lrt -lc -lcrypto -lstdc++ -lssl -liconv -lexecinfo $(EXTRALINK) +LIBS=-rdynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -ljemalloc -lconfig++ -lre2 -linjection -levent -lmariadbclient -lstdc++ -Wl,-Bdynamic -lpthread -lm -lz -lrt -lc -lcrypto -lssl -liconv -lexecinfo $(EXTRALINK) #LIBS=-rdynamic -Wl,-Bstatic -lproxysql -ljemalloc -levent $(GLIB_LIB) -Wl,-Bdynamic -ldl -lpthread -lm -lz -lrt LIBPROXYSQLAR=$(LDIR)/libproxysql.a