diff --git a/deps/Makefile b/deps/Makefile index 87d2a20e8..5605c0578 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -252,13 +252,14 @@ sqlite3/sqlite3/sqlite3.o: sqlite3: sqlite3/sqlite3/sqlite3.o -libconfig/libconfig/lib/.libs/libconfig++.a: + +libconfig/libconfig/out/libconfig++.a: cd libconfig && rm -rf libconfig-*/ || true cd libconfig && tar -zxf libconfig-*.tar.gz - cd libconfig/libconfig && ./configure --disable-examples + cd libconfig/libconfig && cmake -DBUILD_SHARED_LIBS=0 -DBUILD_EXAMPLES=0 -DBUILD_TESTS=0 -DBUILD_FUZZERS=0 . cd libconfig/libconfig && CC=${CC} CXX=${CXX} ${MAKE} -libconfig: libconfig/libconfig/lib/.libs/libconfig++.a +libconfig: libconfig/libconfig/out/libconfig++.a prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: diff --git a/deps/libconfig/libconfig b/deps/libconfig/libconfig index 771e600d3..b3436e1b4 120000 --- a/deps/libconfig/libconfig +++ b/deps/libconfig/libconfig @@ -1 +1 @@ -libconfig-1.7.3 \ No newline at end of file +libconfig-1.8.1 \ No newline at end of file diff --git a/deps/libconfig/libconfig-1.7.3.tar.gz b/deps/libconfig/libconfig-1.7.3.tar.gz deleted file mode 100644 index 424e971d6..000000000 Binary files a/deps/libconfig/libconfig-1.7.3.tar.gz and /dev/null differ diff --git a/deps/libconfig/libconfig-1.8.1.tar.gz b/deps/libconfig/libconfig-1.8.1.tar.gz new file mode 100644 index 000000000..318fd33cc Binary files /dev/null and b/deps/libconfig/libconfig-1.8.1.tar.gz differ diff --git a/src/Makefile b/src/Makefile index 53d0d9b00..2ea996cee 100644 --- a/src/Makefile +++ b/src/Makefile @@ -40,7 +40,7 @@ JEMALLOC_LDIR := $(JEMALLOC_PATH)/lib LIBCONFIG_PATH := $(DEPS_PATH)/libconfig/libconfig LIBCONFIG_IDIR := $(LIBCONFIG_PATH)/lib -LIBCONFIG_LDIR := $(LIBCONFIG_PATH)/lib/.libs +LIBCONFIG_LDIR := $(LIBCONFIG_PATH)/out PROMETHEUS_PATH := $(DEPS_PATH)/prometheus-cpp/prometheus-cpp PROMETHEUS_IDIR := $(PROMETHEUS_PATH)/pull/include -I$(PROMETHEUS_PATH)/core/include