From 55160436b137c78e84dd9d1aa6da30d0f5471312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jaramago=20Fern=C3=A1ndez?=
 <jaramago.fernandez.javier@gmail.com>
Date: Mon, 20 Apr 2020 16:14:36 +0200
Subject: [PATCH] Fixed 'prometheus-cpp' library building following project
 conventions

---
 deps/Makefile                                  | 18 +++++++++---------
 .../{patches => }/serial_exposer.patch         |  0
 lib/Makefile                                   |  2 +-
 src/Makefile                                   |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename deps/prometheus-cpp/{patches => }/serial_exposer.patch (100%)

diff --git a/deps/Makefile b/deps/Makefile
index fc785ebdd..e2a7bcd21 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -161,15 +161,15 @@ libconfig/libconfig/lib/.libs/libconfig++.a:
 
 libconfig: libconfig/libconfig/lib/.libs/libconfig++.a
 
-prometheus-cpp/lib/libprometheus-cpp-core.a:
-	cd prometheus-cpp && tar --strip-components=1 -zxf v0.9.0.tar.gz -C .
-	cd prometheus-cpp && tar --strip-components=1 -zxf civetweb-v1.11.tar.gz -C 3rdparty/civetweb
-	cd prometheus-cpp && tar --strip-components=1 -zxf googletest-v1.10.0.tar.gz -C 3rdparty/googletest
-	cd prometheus-cpp && patch -p1 < patches/serial_exposer.patch
-	cd prometheus-cpp && cmake . -DBUILD_SHARED_LIBS=OFF
-	cd prometheus-cpp && make -j 4
+prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a:
+	cd prometheus-cpp && rm -rf prometheus-cpp-0.9.0
+	cd prometheus-cpp && tar -zxf v0.9.0.tar.gz
+	cd prometheus-cpp && tar --strip-components=1 -zxf civetweb-v1.11.tar.gz -C prometheus-cpp/3rdparty/civetweb
+	cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch
+	cd prometheus-cpp/prometheus-cpp && cmake . -DBUILD_SHARED_LIBS=OFF -DENABLE_TESTING=OFF -DENABLE_PUSH=OFF
+	cd prometheus-cpp/prometheus-cpp && CC=${CC} CXX=${CXX} ${MAKE}
 
-prometheus-cpp: prometheus-cpp/lib/libprometheus-cpp-core.a
+prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a
 
 re2/re2/obj/libre2.a:
 	cd re2 && rm -rf re2-2018-07-01
@@ -221,6 +221,6 @@ cleanall:
 	cd libssl && rm -rf openssl-1.1.1b || true
 	cd libssl && rm -rf openssl-1.1.1d || true
 	cd libconfig && rm -rf libconfig-1.7.2 || true
-	cd prometheus-cpp && make clean
+	cd prometheus-cpp && rm -rf prometheus-cpp-0.9.0 || true
 .PHONY: cleanall
 
diff --git a/deps/prometheus-cpp/patches/serial_exposer.patch b/deps/prometheus-cpp/serial_exposer.patch
similarity index 100%
rename from deps/prometheus-cpp/patches/serial_exposer.patch
rename to deps/prometheus-cpp/serial_exposer.patch
diff --git a/lib/Makefile b/lib/Makefile
index 001267ee5..f0236e719 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -45,7 +45,7 @@ SSL_IDIR=$(SSL_DIR)/include
 EV_DIR=$(DEPS_PATH)/libev/libev/
 EV_IDIR=$(EV_DIR)
 
-PROMETHEUS_PATH=$(DEPS_PATH)/prometheus-cpp
+PROMETHEUS_PATH=$(DEPS_PATH)/prometheus-cpp/prometheus-cpp
 PROMETHEUS_IDIR=$(PROMETHEUS_PATH)/pull/include -I$(PROMETHEUS_PATH)/core/include
 PROMETHEUS_LDIR=$(PROMETHEUS_PATH)/lib
 
diff --git a/src/Makefile b/src/Makefile
index d79aff06e..75b51a576 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -27,7 +27,7 @@ LIBCONFIG_PATH=$(DEPS_PATH)/libconfig/libconfig
 LIBCONFIG_IDIR=-I$(LIBCONFIG_PATH)/lib
 LIBCONFIG_LDIR=-L$(LIBCONFIG_PATH)/lib/.libs
 
-PROMETHEUS_PATH=$(DEPS_PATH)/prometheus-cpp
+PROMETHEUS_PATH=$(DEPS_PATH)/prometheus-cpp/prometheus-cpp
 PROMETHEUS_IDIR=$(PROMETHEUS_PATH)/pull/include -I$(PROMETHEUS_PATH)/core/include
 PROMETHEUS_LDIR=$(PROMETHEUS_PATH)/lib