diff --git a/deps/Makefile b/deps/Makefile index 7a1862b89..8f38a2154 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -9,6 +9,12 @@ MYCFLAGS=-O2 MYJEOPT=--enable-xmalloc --enable-prof endif +ifneq (,$(wildcard /etc/system-release)) + CENTOSVER := $(shell cat /etc/system-release | awk '{print $$3}') +else + CENTOSVER := Unknown +endif + 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 @@ -57,8 +63,16 @@ curl/curl/lib/.libs/libcurl.a: libssl/openssl/libssl.a curl: curl/curl/lib/.libs/libcurl.a libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a: + cd libmicrohttpd && rm -rf libmicrohttpd-0.9.55 || true cd libmicrohttpd && rm -rf libmicrohttpd-0.9.68 || true + cd libmicrohttpd && rm libmicrohttpd || true +ifeq ($(CENTOSVER),6.7) + cd libmicrohttpd && ln -s libmicrohttpd-0.9.55 libmicrohttpd + cd libmicrohttpd && tar -zxf libmicrohttpd-0.9.55.tar.gz +else + cd libmicrohttpd && ln -s libmicrohttpd-0.9.68 libmicrohttpd cd libmicrohttpd && tar -zxf libmicrohttpd-0.9.68.tar.gz +endif cd libmicrohttpd/libmicrohttpd && ./configure --enable-https && CC=${CC} CXX=${CXX} ${MAKE} microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a diff --git a/src/Makefile b/src/Makefile index 92c45fb3f..29cbe816a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,6 +4,12 @@ GIT_VERSION := $(shell git describe --long) DEPS_PATH=../deps +ifneq (,$(wildcard /etc/system-release)) + CENTOSVER := $(shell cat /etc/system-release | awk '{print $$3}') +else + CENTOSVER := Unknown +endif + MARIADB_PATH=$(DEPS_PATH)/mariadb-client-library/mariadb_client MARIADB_IDIR=$(MARIADB_PATH)/include MARIADB_LDIR=$(MARIADB_PATH)/libmariadb @@ -103,6 +109,9 @@ endif ifeq ($(UNAME_S),FreeBSD) MYLIBS+= -lexecinfo endif +ifeq ($(CENTOSVER),6.7) + MYLIBS+= -lgcrypt +endif LIBPROXYSQLAR=$(LDIR)/libproxysql.a ifeq ($(UNAME_S),Darwin)