diff --git a/deps/Makefile b/deps/Makefile index b3b96141e..09eaa2bc8 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -1,6 +1,6 @@ -default: libevent libconfig libdaemon jemalloc mariadb_client re2 sqlite3 +default: libconfig libdaemon jemalloc mariadb_client re2 sqlite3 .PHONY: default @@ -12,14 +12,6 @@ libdaemon/libdaemon/libdaemon/.libs/libdaemon.a: libdaemon: libdaemon/libdaemon/libdaemon/.libs/libdaemon.a -libevent/libevent/.libs/libevent.a: - cd libevent && rm -rf libevent-2.0.22-stable - cd libevent && tar -zxf libevent-2.0.22-stable.tar.gz - cd libevent/libevent && ./configure - cd libevent/libevent && CC=${CC} CXX=${CXX} ${MAKE} - -libevent: libevent/libevent/.libs/libevent.a - jemalloc/jemalloc/lib/libjemalloc.a: cd jemalloc && rm -rf jemalloc-4.2.1 cd jemalloc && tar -jxf jemalloc-4.2.1.tar.bz2 @@ -73,7 +65,6 @@ cleanall: cd mariadb-client-library && rm -rf mariadb-connector-c-2.1.0-src cd libconfig && rm -rf libconfig-1.4.9 cd re2 && rm -rf re2 - cd libevent && rm -rf libevent-2.0.22-stable cd sqlite3/sqlite3 && rm -rf *.o .PHONY: cleanall diff --git a/deps/libevent/libevent b/deps/libevent/libevent deleted file mode 120000 index 99ce3b45f..000000000 --- a/deps/libevent/libevent +++ /dev/null @@ -1 +0,0 @@ -libevent-2.0.22-stable \ No newline at end of file diff --git a/deps/libevent/libevent-2.0.22-stable.tar.gz b/deps/libevent/libevent-2.0.22-stable.tar.gz deleted file mode 100644 index db88cad47..000000000 Binary files a/deps/libevent/libevent-2.0.22-stable.tar.gz and /dev/null differ diff --git a/lib/Makefile b/lib/Makefile index cc4d8708d..2b04a94cb 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -17,9 +17,6 @@ LIBCONFIG_IDIR=-I$(LIBCONFIG_PATH)/lib #INJECTION_PATH=$(DEPS_PATH)/libinjection #INJECTION_IDIR=$(INJECTION_PATH) -LIBEVENT_PATH=$(DEPS_PATH)/libevent/libevent -LIBEVENT_IDIR=$(LIBEVENT_PATH)/include - RE2_PATH=$(DEPS_PATH)/re2/re2 RE2_IDIR=$(RE2_PATH) @@ -27,7 +24,7 @@ SQLITE3_DIR=$(DEPS_PATH)/sqlite3/sqlite3 IDIR=../include -IDIRS=-I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) $(LIBCONFIG_IDIR) -I$(RE2_IDIR) -I$(LIBEVENT_IDIR) -I$(SQLITE3_DIR) +IDIRS=-I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) $(LIBCONFIG_IDIR) -I$(RE2_IDIR) -I$(SQLITE3_DIR) LDIRS=-L$(JEMALLOC_PATH)/lib -L$(RE2_PATH)/obj -L$(INJECTION_PATH) @@ -62,8 +59,8 @@ $(ODIR)/%.o: %.c $(ODIR)/%.oo: %.cpp $(CXX) -fPIC -c -o $@ $< $(MYCPPFLAGS) $(CPPFLAGS) -libproxysql.a: $(ODIR) $(OBJ) $(OBJ_CPP) $(RE2_PATH)/obj/libre2.a $(LIBEVENT_PATH)/.libs/libevent.a $(SQLITE3_DIR)/sqlite3.o - ar rcs $@ $(OBJ) $(OBJ_CPP) $(RE2_PATH)/obj/libre2.a $(LIBEVENT_PATH)/.libs/libevent.a $(SQLITE3_DIR)/sqlite3.o +libproxysql.a: $(ODIR) $(OBJ) $(OBJ_CPP) $(RE2_PATH)/obj/libre2.a $(SQLITE3_DIR)/sqlite3.o + ar rcs $@ $(OBJ) $(OBJ_CPP) $(RE2_PATH)/obj/libre2.a $(SQLITE3_DIR)/sqlite3.o $(ODIR): mkdir $(ODIR) diff --git a/lib/MySQL_Monitor.cpp b/lib/MySQL_Monitor.cpp index 552e2ddd7..72f8c0f96 100644 --- a/lib/MySQL_Monitor.cpp +++ b/lib/MySQL_Monitor.cpp @@ -14,10 +14,6 @@ #endif /* DEBUG */ #define MYSQL_MONITOR_VERSION "0.2.0902" DEB - - -#include - extern ProxySQL_Admin *GloAdmin; extern MySQL_Threads_Handler *GloMTH; diff --git a/src/Makefile b/src/Makefile index dfd2112eb..5808337bd 100644 --- a/src/Makefile +++ b/src/Makefile @@ -13,10 +13,6 @@ DAEMONPATH=$(DEPS_PATH)/libdaemon/libdaemon DAEMONPATH_IDIR=$(DAEMONPATH) DAEMONPATH_LDIR=$(DAEMONPATH)/libdaemon/.libs -#LIBEVENT_PATH=$(DEPS_PATH)/libevent/libevent -#LIBEVENT_IDIR=$(LIBEVENT_PATH)/include -#LIBEVENT_LDIR=$(LIBEVENT_PATH)/.libs - JEMALLOC_PATH=$(DEPS_PATH)/jemalloc/jemalloc JEMALLOC_IDIR=$(JEMALLOC_PATH)/include/jemalloc JEMALLOC_LDIR=$(JEMALLOC_PATH)/lib @@ -25,10 +21,6 @@ LIBCONFIG_PATH=$(DEPS_PATH)/libconfig/libconfig-1.4.9 LIBCONFIG_IDIR=-I$(LIBCONFIG_PATH)/lib LIBCONFIG_LDIR=-L$(LIBCONFIG_PATH)/lib/.libs -LIBEVENT_PATH=$(DEPS_PATH)/libevent/libevent -LIBEVENT_IDIR=$(LIBEVENT_PATH)/include -LIBEVENT_LDIR=$(LIBEVENT_PATH)/.libs - RE2_PATH=$(DEPS_PATH)/re2/re2 RE2_IDIR=$(RE2_PATH) @@ -37,12 +29,12 @@ SQLITE3_DIR=$(DEPS_PATH)/sqlite3/sqlite3 IDIR=../include LDIR=../lib IDIRS=-I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) $(LIBCONFIG_IDIR) -I$(DAEMONPATH_IDIR) -I$(SQLITE3_DIR) -LDIRS=-L$(LDIR) -L$(JEMALLOC_LDIR) $(LIBCONFIG_LDIR) -L$(RE2_PATH)/obj -L$(LIBEVENT_LDIR) -L$(MARIADB_LDIR) -L$(DAEMONPATH_LDIR) +LDIRS=-L$(LDIR) -L$(JEMALLOC_LDIR) $(LIBCONFIG_LDIR) -L$(RE2_PATH)/obj -L$(MARIADB_LDIR) -L$(DAEMONPATH_LDIR) MYCPPFLAGS=-std=c++11 $(IDIRS) $(OPTZ) $(DEBUG) LDFLAGS+= -MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -ljemalloc -lconfig++ -lre2 -levent -lmariadbclient -Wl,-Bdynamic -lpthread -lm -lz -lrt -lcrypto -lssl $(EXTRALINK) +MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -ljemalloc -lconfig++ -lre2 -lmariadbclient -Wl,-Bdynamic -lpthread -lm -lz -lrt -lcrypto -lssl $(EXTRALINK) #MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -lconfig++ -lre2 -levent -lmariadbclient -Wl,-Bdynamic -lpthread -lm -lz -lrt -lcrypto -lssl $(EXTRALINK) UNAME_S := $(shell uname -s)