CVS commit: pkgsrc/databases/prometheus-cpp

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jul 20 21:40:53 UTC 2023

Modified Files:
        pkgsrc/databases/prometheus-cpp: Makefile buildlink3.mk
Added Files:
        pkgsrc/databases/prometheus-cpp: options.mk

Log Message:
prometheus-cpp: Require a C++14 compiler.

While here, option-ize building tests. They're not installed anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/prometheus-cpp/Makefile \
    pkgsrc/databases/prometheus-cpp/buildlink3.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/prometheus-cpp/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/prometheus-cpp/Makefile
diff -u pkgsrc/databases/prometheus-cpp/Makefile:1.1 pkgsrc/databases/prometheus-cpp/Makefile:1.2
--- pkgsrc/databases/prometheus-cpp/Makefile:1.1        Mon Jun 26 11:39:20 2023
+++ pkgsrc/databases/prometheus-cpp/Makefile    Thu Jul 20 21:40:53 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2023/06/26 11:39:20 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2023/07/20 21:40:53 nia Exp $
 
 DISTNAME=      prometheus-cpp-with-submodules
 PKGNAME=       prometheus-cpp-1.1.0
+PKGREVISION=   1
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jupp0r/}
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}
@@ -16,6 +17,8 @@ LICENSE=      mit
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++
 
+USE_CXX_FEATURES+=     c++14
+
 PKGCONFIG_OVERRIDE+=   3rdparty/googletest/googlemock/cmake/gmock.pc.in
 PKGCONFIG_OVERRIDE+=   3rdparty/googletest/googlemock/cmake/gmock_main.pc.in
 PKGCONFIG_OVERRIDE+=   3rdparty/googletest/googletest/cmake/gtest.pc.in
@@ -24,6 +27,7 @@ PKGCONFIG_OVERRIDE+=  cmake/prometheus-cp
 PKGCONFIG_OVERRIDE+=   cmake/prometheus-cpp-pull.pc.in
 PKGCONFIG_OVERRIDE+=   cmake/prometheus-cpp-push.pc.in
 
+.include "options.mk"
 .include "../../devel/cmake/build.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
Index: pkgsrc/databases/prometheus-cpp/buildlink3.mk
diff -u pkgsrc/databases/prometheus-cpp/buildlink3.mk:1.1 pkgsrc/databases/prometheus-cpp/buildlink3.mk:1.2
--- pkgsrc/databases/prometheus-cpp/buildlink3.mk:1.1   Mon Jun 26 11:39:20 2023
+++ pkgsrc/databases/prometheus-cpp/buildlink3.mk       Thu Jul 20 21:40:53 2023
@@ -1,10 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2023/06/26 11:39:20 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2023/07/20 21:40:53 nia Exp $
 
 BUILDLINK_TREE+=       prometheus-cpp
 
 .if !defined(PROMETHEUS_CPP_BUILDLINK3_MK)
 PROMETHEUS_CPP_BUILDLINK3_MK:=
 
+USE_CXX_FEATURES+=             c++14
+
 BUILDLINK_DEPMETHOD.prometheus-cpp?=   build
 
 BUILDLINK_API_DEPENDS.prometheus-cpp+= prometheus-cpp>=1.1.0

Added files:

Index: pkgsrc/databases/prometheus-cpp/options.mk
diff -u /dev/null pkgsrc/databases/prometheus-cpp/options.mk:1.1
--- /dev/null   Thu Jul 20 21:40:53 2023
+++ pkgsrc/databases/prometheus-cpp/options.mk  Thu Jul 20 21:40:53 2023
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2023/07/20 21:40:53 nia Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.prometheus-cpp
+
+# Tests are not installed, so default off.
+PKG_SUPPORTED_OPTIONS= tests
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mtests)
+TEST_TARGET=   test
+CMAKE_ARGS+=   -DENABLE_TESTING=ON
+# XXX: it's using an internal copy...
+#.  include "../../devel/googletest/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -DENABLE_TESTING=OFF
+.endif