Patch provides debundling libraries: pcre, curl, sqlite3, lz4, libssl
libconfig, libdeamon, ev
Only in test1/deps/jemalloc: jemalloc-5.2.0
Only in test1/deps/libhttpserver: libhttpserver-master_20191121
Only in test1/deps/libinjection: libinjection-3.10.0
Only in test1/deps/libmicrohttpd: libmicrohttpd-0.9.68
diff -ur proxysql-2.0.13/deps/Makefile test1/deps/Makefile
--- proxysql-2.0.13/deps/Makefile 2020-07-14 17:56:03.000000000 +0200
+++ test1/deps/Makefile 2020-08-03 21:53:02.961306370 +0200
@@ -1,4 +1,5 @@
+UNAME_S := $(shell uname -s)
PROXYDEBUG := $(shell echo $(PROXYDEBUG))
ifeq ($(PROXYDEBUG),1)
@@ -17,9 +18,9 @@
PROXYSQLCLICKHOUSE := $(shell echo $(PROXYSQLCLICKHOUSE))
ifeq ($(PROXYSQLCLICKHOUSE),1)
-default: libconfig libdaemon jemalloc mariadb_client re2 sqlite3 pcre clickhouse-cpp lz4 cityhash microhttpd curl ev libssl libhttpserver libinjection
+default: jemalloc mariadb_client re2 clickhouse-cpp cityhash microhttpd libhttpserver libinjection
else
-default: libconfig libdaemon jemalloc mariadb_client re2 sqlite3 pcre microhttpd curl ev libssl libhttpserver libinjection
+default: jemalloc mariadb_client re2 microhttpd libhttpserver libinjection
endif
.PHONY: default
@@ -27,23 +28,19 @@
libinjection/libinjection/src/libinjection.a:
cd libinjection && rm -rf libinjection-3.10.0 || true
cd libinjection && tar -zxf libinjection-3.10.0.tar.gz
+ cd libinjection/libinjection && patch -p1 < ../../../../libinjection_python2_to_3.patch
+
cd libinjection/libinjection && CC=${CC} CXX=${CXX} ${MAKE}
libinjection: libinjection/libinjection/src/libinjection.a
-libssl/openssl/libssl.a:
-# cd libssl && rm -rf openssl-1.1.0h || true
-# cd libssl && tar -zxf openssl-1.1.0h.tar.gz
- cd libssl && rm -rf openssl-1.1.1d || true
- cd libssl && rm -rf openssl-1.1.0h || true
- cd libssl && tar -zxf openssl-1.1.1d.tar.gz
- cd libssl/openssl && ./config no-ssl3
- cd libssl/openssl && CC=${CC} CXX=${CXX} ${MAKE}
- cd libssl/openssl && ln -s . lib # curl wants this path
-libssl: libssl/openssl/libssl.a
libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a
cd libhttpserver && rm -rf libhttpserver-master_20191121 || true
+ cd libhttpserver && rm -rf libhttpserver-0.18.1 || true
cd libhttpserver && tar -zxf libhttpserver-master_20191121.tar.gz
+ifeq ($(UNAME_S),FreeBSD)
+ sed -i -e 's/\/bin\/bash/\/usr\/local\/bin\/bash/' libhttpserver/libhttpserver/bootstrap
+endif
cd libhttpserver/libhttpserver && ./bootstrap && mkdir build
cd libhttpserver/libhttpserver/build && LDFLAGS=-L$(shell pwd)/libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/ CPPFLAGS=-I$(shell pwd)/libmicrohttpd/libmicrohttpd/src/include ../configure --disable-doxygen-doc --disable-doxygen-dot --disable-doxygen-man --disable-doxygen-html
cd libhttpserver/libhttpserver/build && CC=${CC} CXX=${CXX} ${MAKE}
@@ -56,12 +53,6 @@
cd libev/libev && CC=${CC} CXX=${CXX} ${MAKE}
ev: libev/libev/.libs/libev.a
-curl/curl/lib/.libs/libcurl.a: libssl/openssl/libssl.a
- cd curl && rm -rf curl-7.57.0 || true
- cd curl && tar -zxf curl-7.57.0.tar.gz
- #cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --with-ssl=$(shell pwd)/../../libssl/openssl/ && CC=${CC} CXX=${CXX} ${MAKE}
- cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --without-librtmp --without-libpsl --with-ssl=$(shell pwd)/libssl/openssl/ --enable-shared=no && CC=${CC} CXX=${CXX} ${MAKE}
-curl: curl/curl/lib/.libs/libcurl.a
libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a:
cd libmicrohttpd && rm -rf libmicrohttpd-0.9.55 || true
@@ -75,6 +66,7 @@
cd libmicrohttpd && tar -zxf libmicrohttpd-0.9.68.tar.gz
endif
cd libmicrohttpd/libmicrohttpd && ./configure --enable-https && CC=${CC} CXX=${CXX} ${MAKE}
+ cp libmicrohttpd/libmicrohttpd/MHD_config.h libmicrohttpd/libmicrohttpd/src/include/MHD_config.h
microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a
cityhash/cityhash/src/.libs/libcityhash.a:
@@ -83,11 +75,6 @@
cd cityhash/cityhash && ./configure && CC=${CC} CXX=${CXX} ${MAKE}
cityhash: cityhash/cityhash/src/.libs/libcityhash.a
-lz4/lz4/liblz4.a:
- cd lz4 && rm -rf lz4-1.7.5 || true
- cd lz4 && tar -zxf lz4-1.7.5.tar.gz
- cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE}
-lz4: lz4/lz4/liblz4.a
clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib.a:
cd clickhouse-cpp && rm -rf clickhouse-cpp || true
@@ -98,13 +85,6 @@
clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib.a
-libdaemon/libdaemon/libdaemon/.libs/libdaemon.a:
- cd libdaemon && rm -rf libdaemon-0.14
- cd libdaemon && tar -zxf libdaemon-0.14.tar.gz
- cd libdaemon/libdaemon && ./configure --disable-examples
- cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE}
-
-libdaemon: libdaemon/libdaemon/libdaemon/.libs/libdaemon.a
jemalloc/jemalloc/lib/libjemalloc.a:
cd jemalloc && rm -rf jemalloc-5.2.0
@@ -118,13 +98,13 @@
jemalloc: jemalloc/jemalloc/lib/libjemalloc.a
-mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a: libssl/openssl/libssl.a
+mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a:
cd mariadb-client-library && rm -rf mariadb-connector-c-3.1.4-src
cd mariadb-client-library && tar -zxf mariadb-connector-c-3.1.4-src.tar.gz
cd mariadb-client-library/mariadb_client && patch ./plugins/auth/CMakeLists.txt < ../plugin_auth_CMakeLists.txt.patch
- cd mariadb-client-library/mariadb_client && patch ./CMakeLists.txt < ../CMakeLists.txt.patch
+ cd mariadb-client-library/mariadb_client && patch ./CMakeLists.txt < ../CMakeLists.txt.patch
# cd mariadb-client-library/mariadb_client && cmake . -DOPENSSL_ROOT_DIR=$(shell pwd)/libssl/openssl/ -DOPENSSL_LIBRARIES=$(shell pwd)/libssl/openssl/ .
- cd mariadb-client-library/mariadb_client && cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(shell pwd)/libssl/openssl/ -DOPENSSL_LIBRARIES=$(shell pwd)/libssl/openssl/ .
+ cd mariadb-client-library/mariadb_client && cmake . -DOPENSSL_ROOT_DIR=usr/include/openssl/ -DOPENSSL_LIBRARIES=/usr/bin .
# cd mariadb-client-library/mariadb_client && cmake . -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl # this is needed on MacOSX
cd mariadb-client-library/mariadb_client && patch libmariadb/mariadb_stmt.c < ../mariadb_stmt.c.patch
cd mariadb-client-library/mariadb_client && patch libmariadb/mariadb_lib.c < ../mariadb_lib.c.patch
@@ -145,22 +125,6 @@
mariadb_client: mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a
-sqlite3/sqlite3/sqlite3.o:
- cd sqlite3 && rm -rf sqlite-amalgamation-3190200
- cd sqlite3 && tar -zxf sqlite-amalgamation-3190200.tar.gz
- cd sqlite3/sqlite3 && patch sqlite3.c < ../from_unixtime.patch
- cd sqlite3/sqlite3 && ${CC} ${MYCFLAGS} -c -o sqlite3.o sqlite3.c -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_JSON1
-
-sqlite3: sqlite3/sqlite3/sqlite3.o
-
-libconfig/libconfig/lib/.libs/libconfig++.a:
- cd libconfig && rm -rf libconfig-1.7.2
- cd libconfig && tar -zxf libconfig-1.7.2.tar.gz
- cd libconfig/libconfig && ./configure --disable-examples
- cd libconfig/libconfig && CC=${CC} CXX=${CXX} ${MAKE}
-
-libconfig: libconfig/libconfig/lib/.libs/libconfig++.a
-
re2/re2/obj/libre2.a:
cd re2 && rm -rf re2-2018-07-01
@@ -173,13 +137,6 @@
re2: re2/re2/obj/libre2.a
-pcre/pcre/.libs/libpcre.a:
- cd pcre && rm -rf pcre-8.39
- cd pcre && tar -zxf pcre-8.39.tar.gz
- cd pcre/pcre && ./configure
- cd pcre/pcre && CC=${CC} CXX=${CXX} ${MAKE}
-pcre: pcre/pcre/.libs/libpcre.a
-
cleanpart:
cd mariadb-client-library && rm -rf mariadb-connector-c-2.3.1
cd mariadb-client-library && rm -rf mariadb-connector-c-3.0.2-src
@@ -191,6 +148,7 @@
cleanall:
cd libinjection && rm -rf libinjection-3.10.0 || true
cd libhttpserver && rm -rf libhttpserver-master_20191121 || true
+ cd libhttpserver && rm -rf libhttpserver-0.18.1 || true
cd libdaemon && rm -rf libdaemon-0.14
cd jemalloc && rm -rf jemalloc-4.3.1 || true
cd jemalloc && rm -rf jemalloc-5.2.0 || true
Only in test1/deps/mariadb-client-library: mariadb-connector-c-3.1.4-src
Only in test1/deps/re2: re2-2018-07-01
Only in test1/lib: libproxysql.a
diff -ur proxysql-2.0.13/lib/Makefile test1/lib/Makefile
--- proxysql-2.0.13/lib/Makefile 2020-07-14 17:56:03.000000000 +0200
+++ test1/lib/Makefile 2020-08-03 21:53:47.213770192 +0200
@@ -1,9 +1,3 @@
-ifndef GIT_VERSION
-GIT_VERSION := $(shell git describe --long)
-ifndef GIT_VERSION
-$(error GIT_VERSION is not set)
-endif
-endif
DEPS_PATH=../deps
@@ -14,36 +8,22 @@
JEMALLOC_PATH=$(DEPS_PATH)/jemalloc/jemalloc
JEMALLOC_IDIR=$(JEMALLOC_PATH)/include/jemalloc
-LIBCONFIG_PATH=$(DEPS_PATH)/libconfig/libconfig
-LIBCONFIG_IDIR=-I$(LIBCONFIG_PATH)/lib
-
#INJECTION_PATH=$(DEPS_PATH)/libinjection
#INJECTION_IDIR=$(INJECTION_PATH)
RE2_PATH=$(DEPS_PATH)/re2/re2
RE2_IDIR=$(RE2_PATH)
-PCRE_PATH=$(DEPS_PATH)/pcre/pcre
-
-SQLITE3_DIR=$(DEPS_PATH)/sqlite3/sqlite3
-
CLICKHOUSE_CPP_DIR=$(DEPS_PATH)/clickhouse-cpp/clickhouse-cpp
LIBINJECTION_DIR=$(DEPS_PATH)/libinjection/libinjection
-LIBINJECTION_IDIR=-I$(LIBINJECTION_DIR)/src
+LIBINJECTION_IDIR=$(LIBINJECTION_DIR)/src
LIBHTTPSERVER_DIR=$(DEPS_PATH)/libhttpserver/libhttpserver
-LIBHTTPSERVER_IDIR=-I$(LIBHTTPSERVER_DIR)/src
+LIBHTTPSERVER_IDIR=$(LIBHTTPSERVER_DIR)/src
MICROHTTPD_DIR=$(DEPS_PATH)/libmicrohttpd/libmicrohttpd
-MICROHTTPD_IDIR=-I$(MICROHTTPD_DIR) -I$(MICROHTTPD_DIR)/src/include
-
-CURL_DIR=$(DEPS_PATH)/curl/curl
-CURL_IDIR=-I$(CURL_DIR)/include
-
-SSL_DIR=$(DEPS_PATH)/libssl/openssl/
-SSL_IDIR=$(SSL_DIR)/include
-
+MICROHTTPD_IDIR=$(MICROHTTPD_DIR) -I$(MICROHTTPD_DIR)/src/include
EV_DIR=$(DEPS_PATH)/libev/libev/
EV_IDIR=$(EV_DIR)
@@ -51,7 +31,7 @@
IDIR=../include
-IDIRS=-I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) $(LIBCONFIG_IDIR) -I$(RE2_IDIR) -I$(SQLITE3_DIR) -I$(PCRE_PATH) -I/usr/local/include -I$(CLICKHOUSE_CPP_DIR) $(MICROHTTPD_IDIR) $(LIBHTTPSERVER_IDIR) $(LIBINJECTION_IDIR) $(CURL_IDIR) -I$(EV_DIR) -I$(SSL_IDIR)
+IDIRS=-I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) -I$(RE2_IDIR) -I/usr/local/include -I$(CLICKHOUSE_CPP_DIR) -I$(MICROHTTPD_IDIR) -I$(LIBHTTPSERVER_IDIR) -I$(EV_DIR) -I$(LIBINJECTION_IDIR)
LDIRS=-L$(JEMALLOC_PATH)/lib -L$(RE2_PATH)/obj -L$(INJECTION_PATH)
@@ -111,8 +91,8 @@
$(ODIR)/%.oo: %.cpp $(HEADERS)
$(CXX) -fPIC -c -o $@ $< $(MYCXXFLAGS) $(CXXFLAGS)
-libproxysql.a: $(ODIR) $(OBJ) $(OBJ_CXX) $(RE2_PATH)/obj/libre2.a $(SQLITE3_DIR)/sqlite3.o
- ar rcs $@ $(OBJ) $(OBJ_CXX) $(RE2_PATH)/obj/libre2.a $(SQLITE3_DIR)/sqlite3.o
+libproxysql.a: $(ODIR) $(OBJ) $(OBJ_CXX) $(RE2_PATH)/obj/libre2.a
+ ar rcs $@ $(OBJ) $(OBJ_CXX) $(RE2_PATH)/obj/libre2.a
$(ODIR):
mkdir $(ODIR)
Only in test1/lib: obj
diff -ur proxysql-2.0.13/Makefile test1/Makefile
--- proxysql-2.0.13/Makefile 2020-07-14 17:56:03.000000000 +0200
+++ test1/Makefile 2020-08-03 21:38:06.595911348 +0200
@@ -1,9 +1,3 @@
-ifndef GIT_VERSION
-GIT_VERSION := $(shell git describe --long)
-ifndef GIT_VERSION
-$(error GIT_VERSION is not set)
-endif
-endif
O0=-O0
O2=-O2
diff -ur proxysql-2.0.13/src/Makefile test1/src/Makefile
--- proxysql-2.0.13/src/Makefile 2020-07-14 17:56:03.000000000 +0200
+++ test1/src/Makefile 2020-08-03 21:59:31.851803380 +0200
@@ -1,9 +1,3 @@
-ifndef GIT_VERSION
-GIT_VERSION := $(shell git describe --long)
-ifndef GIT_VERSION
-$(error GIT_VERSION is not set)
-endif
-endif
DEPS_PATH=../deps
@@ -18,30 +12,16 @@
MARIADB_LDIR=$(MARIADB_PATH)/libmariadb
-DAEMONPATH=$(DEPS_PATH)/libdaemon/libdaemon
-DAEMONPATH_IDIR=$(DAEMONPATH)
-DAEMONPATH_LDIR=$(DAEMONPATH)/libdaemon/.libs
-
JEMALLOC_PATH=$(DEPS_PATH)/jemalloc/jemalloc
JEMALLOC_IDIR=$(JEMALLOC_PATH)/include/jemalloc
JEMALLOC_LDIR=$(JEMALLOC_PATH)/lib
-LIBCONFIG_PATH=$(DEPS_PATH)/libconfig/libconfig
-LIBCONFIG_IDIR=-I$(LIBCONFIG_PATH)/lib
-LIBCONFIG_LDIR=-L$(LIBCONFIG_PATH)/lib/.libs
-
RE2_PATH=$(DEPS_PATH)/re2/re2
RE2_IDIR=$(RE2_PATH)
-PCRE_PATH=$(DEPS_PATH)/pcre/pcre
-PCRE_LDIR=$(PCRE_PATH)/.libs
-
-SQLITE3_DIR=$(DEPS_PATH)/sqlite3/sqlite3
-
CLICKHOUSE_CPP_DIR=$(DEPS_PATH)/clickhouse-cpp/clickhouse-cpp
CITYHASH_DIR=$(DEPS_PATH)/cityhash/cityhash/src/.libs
-LZ4_DIR=$(DEPS_PATH)/lz4/lz4
CLICKHOUSE_CPP_DIR=$(DEPS_PATH)/clickhouse-cpp/clickhouse-cpp
@@ -51,30 +31,16 @@
LIBHTTPSERVER_DIR=$(DEPS_PATH)/libhttpserver/libhttpserver
LIBHTTPSERVER_IDIR=$(LIBHTTPSERVER_DIR)/src
-LIBHTTPSERVER_LDIR=$(LIBHTTPSERVER_DIR)/build/src/.libs/
+LIBHTTPSERVER_LDIR=$(LIBHTTPSERVER_DIR)/build/src/.libs
MICROHTTPD_DIR=$(DEPS_PATH)/libmicrohttpd/libmicrohttpd/src
MICROHTTPD_IDIR=$(MICROHTTPD_DIR)/include
MICROHTTPD_LDIR=$(MICROHTTPD_DIR)/microhttpd/.libs
-CURL_DIR=$(DEPS_PATH)/curl/curl
-CURL_IDIR=$(CURL_DIR)/include
-CURL_LDIR=$(CURL_DIR)/lib/.libs
-
-SSL_DIR=$(DEPS_PATH)/libssl/openssl/
-SSL_IDIR=$(SSL_DIR)/include
-SSL_LDIR=$(SSL_DIR)
-
-
-EV_DIR=$(DEPS_PATH)/libev/libev/
-EV_IDIR=$(EV_DIR)
-EV_LDIR=$(EV_DIR)/.libs
-
IDIR=../include
LDIR=../lib
-IDIRS=-I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) $(LIBCONFIG_IDIR) -I$(DAEMONPATH_IDIR) -I$(SQLITE3_DIR) -I$(CLICKHOUSE_CPP_DIR) -I$(MICROHTTPD_IDIR) -I$(LIBHTTPSERVER_IDIR) -I$(LIBINJECTION_IDIR) -I$(CURL_IDIR) -I$(EV_IDIR) -I$(SSL_IDIR) -I$(RE2_IDIR)
-LDIRS=-L$(LDIR) -L$(JEMALLOC_LDIR) $(LIBCONFIG_LDIR) -L$(RE2_PATH)/obj -L$(MARIADB_LDIR) -L$(DAEMONPATH_LDIR) -L$(PCRE_LDIR) -L$(MICROHTTPD_LDIR) -L$(LIBHTTPSERVER_LDIR) -L$(LIBINJECTION_LDIR) -L$(CURL_LDIR) -L$(EV_LDIR) -L$(SSL_LDIR)
-
+IDIRS=-I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) -I$(CLICKHOUSE_CPP_DIR) -I$(MICROHTTPD_IDIR) -I$(LIBHTTPSERVER_IDIR) -I$(RE2_IDIR)
+LDIRS=-L$(LDIR) -L$(JEMALLOC_LDIR) -L$(RE2_PATH)/obj -L$(MARIADB_LDIR) -L$(MICROHTTPD_LDIR) -L$(LIBHTTPSERVER_LDIR) -L$(LIBINJECTION_LDIR)
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Darwin)
@@ -94,9 +60,9 @@
LDFLAGS+=
NOJEMALLOC := $(shell echo $(NOJEMALLOC))
ifeq ($(NOJEMALLOC),1)
-MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -lconfig++ -lre2 -lpcrecpp -lpcre -lmariadbclient -lmicrohttpd -lhttpserver -linjection -lcurl -lssl -lcrypto -lev -Wl,-Bdynamic -lgnutls -lpthread -lm -lz -lrt $(EXTRALINK)
+MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lproxysql -lhttpserver -lmicrohttpd -lre2 -lmariadbclient -linjection -Wl,-Bdynamic -lgnutls -lssl -lcrypto -lsqlite3 -lev -ldaemon -lconfig -lconfig++ -lpcre -lpcrecpp -lcurl -lpthread -lm -lz -lrt $(EXTRALINK)
else
-MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -ljemalloc -lconfig++ -lre2 -lpcrecpp -lpcre -lmariadbclient -lhttpserver -lmicrohttpd -linjection -lcurl -lssl -lcrypto -lev -Wl,-Bdynamic -lgnutls -lpthread -lm -lz -lrt $(EXTRALINK)
+MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lproxysql -ljemalloc -lre2 -lmariadbclient -lhttpserver -lmicrohttpd -linjection -Wl,-Bdynamic -lgnutls -lev -lssl -lcrypto -lsqlite3 -ldaemon -lconfig -lconfig++ -lpthread -lm -lz -lrt -lpcre -lpcrecpp -lcurl $(EXTRALINK)
endif
ifeq ($(UNAME_S),Darwin)
@@ -118,10 +84,9 @@
LIBPROXYSQLAR=$(LDIR)/libproxysql.a
ifeq ($(UNAME_S),Darwin)
- LIBPROXYSQLAR=$(LDIR)/libproxysql.a ../deps/libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a ../deps/libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a ../deps/pcre/pcre/.libs/libpcre.a ../deps/pcre/pcre/.libs/libpcrecpp.a ../deps/libdaemon/libdaemon/libdaemon/.libs/libdaemon.a ../deps/libconfig/libconfig/lib/.libs/libconfig++.a ../deps/libconfig/libconfig/lib/.libs/libconfig.a ../deps/curl/curl/lib/.libs/libcurl.a ../deps/sqlite3/sqlite3/sqlite3.o
+LIBPROXYSQLAR=$(LDIR)/libproxysql.a ../deps/libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a ../deps/libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a
endif
-LIBPROXYSQLAR+= $(SSL_LDIR)/libssl.a $(SSL_LDIR)/libcrypto.a
ODIR= obj
EXECUTABLE=proxysql
@@ -134,7 +99,7 @@
proxysql: $(ODIR) $(OBJ) $(LIBPROXYSQLAR)
ifeq ($(PROXYSQLCLICKHOUSE),1)
- $(CXX) -o $@ $(OBJ) $(LIBPROXYSQLAR) $(CLICKHOUSE_CPP_DIR)/clickhouse/libclickhouse-cpp-lib.a $(CITYHASH_DIR)/libcityhash.a $(LZ4_DIR)/liblz4.a $(MYCXXFLAGS) $(CXXFLAGS) $(LDIRS) $(LIBS) $(LDFLAGS) $(MYLIBS)
+ $(CXX) -o $@ $(OBJ) $(LIBPROXYSQLAR) $(CLICKHOUSE_CPP_DIR)/clickhouse/libclickhouse-cpp-lib.a $(CITYHASH_DIR)/libcityhash.a $(MYCXXFLAGS) $(CXXFLAGS) $(LDIRS) $(LIBS) $(LDFLAGS) $(MYLIBS)
else
$(CXX) -o $@ $(OBJ) $(LIBPROXYSQLAR) $(MYCXXFLAGS) $(CXXFLAGS) $(LDIRS) $(LIBS) $(LDFLAGS) $(MYLIBS)
endif
Only in test1/src: obj
Only in test1/src: proxysql