From be23c912c523a1c2730f83c96621e23a91881c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 30 Aug 2023 22:47:41 +0700 Subject: [PATCH] prometheus-cpp: use C++17 New abseil requires at least C++14. --- srcpkgs/prometheus-cpp/template | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/srcpkgs/prometheus-cpp/template b/srcpkgs/prometheus-cpp/template index d0a4f976980..1eb4c373d93 100644 --- a/srcpkgs/prometheus-cpp/template +++ b/srcpkgs/prometheus-cpp/template @@ -5,8 +5,8 @@ revision=1 _hash_client_model=fa8ad6fec33561be4280a8f0514318c79d7f6cb6 _hash_googletest=ec44c6c1675c25b9827aacd08c02433cccde7780 _hash_civetweb=fbdee7440be24f904208c15a1fc9e2582b866049 -create_wrksrc=yes build_style=cmake +configure_args="-DCMAKE_CXX_STANDARD=17" hostmakedepends="telegraf protobuf" makedepends="protobuf-devel" short_desc="Prometheus Client Library in Modern C++" @@ -14,19 +14,24 @@ maintainer="Toyam Cox " license="MIT" homepage="https://github.com/jupp0r/prometheus-cpp" distfiles="https://github.com/jupp0r/prometheus-cpp/archive/v${version}.tar.gz - https://github.com/civetweb/civetweb/archive/${_hash_civetweb}.tar.gz>prometheus-cpp-civetweb.tgz - https://github.com/google/googletest/archive/${_hash_googletest}.tar.gz>prometheus-cpp-googletest.tgz - https://github.com/prometheus/client_model/archive/${_hash_client_model}.tar.gz>prometheus-cpp-client_model.tgz" + https://github.com/civetweb/civetweb/archive/${_hash_civetweb}.tar.gz>civetweb-${_hash_civetweb}.tgz + https://github.com/google/googletest/archive/${_hash_googletest}.tar.gz>googletest-${_hash_googletest}.tgz + https://github.com/prometheus/client_model/archive/${_hash_client_model}.tar.gz>client_model-${_hash_client_model}.tgz" checksum="d5ea6dffca5185fb30b9b643343f2ab1d6113672d7aec3e75e0cfa757f50ea25 8bf320432b7840245c9caf717a6027b30eaf52948e05e694c5149e9dd066f603 175a22300b3450e27e5f2e6f95cc9abca74617cbc21a1e0ed19bdfbd22ea0305 d29d75de6645bd67452df27cda2e4a09848161f9ecacc62b1c1818d0a701cff9" +skip_extraction=" + civetweb-${_hash_civetweb}.tgz + googletest-${_hash_googletest}.tgz + client_model-${_hash_client_model}.tgz" + post_extract() { - mv prometheus-cpp-$version/* . - mv civetweb-${_hash_civetweb}/* 3rdparty/civetweb - mv googletest-${_hash_googletest}/* 3rdparty/googletest - mv client_model-${_hash_client_model}/* 3rdparty/prometheus_client_model + vsrcextract -C 3rdparty/civetweb civetweb-${_hash_civetweb}.tgz + vsrcextract -C 3rdparty/googletest googletest-${_hash_googletest}.tgz + vsrcextract -C 3rdparty/prometheus_client_model \ + client_model-${_hash_client_model}.tgz } pre_configure() {