CVS commit: pkgsrc/devel/google-glog

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jul 21 08:16:01 UTC 2023

Modified Files:
        pkgsrc/devel/google-glog: Makefile
Added Files:
        pkgsrc/devel/google-glog: options.mk

Log Message:
google-glog: Option-ize building tests, because googletest is a very
heavy dependency and often brings in a new compiler too.

Surprisingly, this package builds just fine (if googletest is disabled)
with a C++98 default, so remove C++11 from USE_LANGUAGES (googletest
requires C++14 anyway).

XXX some of the tests fail, the tests were not hooked up to run before.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/google-glog/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/google-glog/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/devel/google-glog/Makefile
diff -u pkgsrc/devel/google-glog/Makefile:1.12 pkgsrc/devel/google-glog/Makefile:1.13
--- pkgsrc/devel/google-glog/Makefile:1.12      Sun Jun 25 11:26:19 2023
+++ pkgsrc/devel/google-glog/Makefile   Fri Jul 21 08:16:01 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2023/06/25 11:26:19 he Exp $
+# $NetBSD: Makefile,v 1.13 2023/07/21 08:16:01 nia Exp $
 
 DISTNAME=      glog-0.6.0
 PKGNAME=       google-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=google/}
 GITHUB_PROJECT=        glog
@@ -12,7 +13,7 @@ HOMEPAGE=     https://github.com/google/glog
 COMMENT=       Application Level Logging library for C++
 LICENSE=       modified-bsd
 
-USE_LANGUAGES= c c++11
+USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config
 
 CMAKE_ARGS+=   -DWITH_UNWIND=OFF
@@ -24,8 +25,8 @@ BUILDLINK_TRANSFORM.SunOS+=   rm:-pie
 LDFLAGS+=      -lexecinfo
 .endif
 
+.include "options.mk"
 .include "../../devel/cmake/build.mk"
 .include "../../devel/gflags/buildlink3.mk"
-.include "../../devel/googletest/buildlink3.mk"
 .include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/devel/google-glog/options.mk
diff -u /dev/null pkgsrc/devel/google-glog/options.mk:1.1
--- /dev/null   Fri Jul 21 08:16:01 2023
+++ pkgsrc/devel/google-glog/options.mk Fri Jul 21 08:16:01 2023
@@ -0,0 +1,23 @@
+# $NetBSD: options.mk,v 1.1 2023/07/21 08:16:01 nia Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.google-glog
+
+# Tests are not installed, so default off.
+PKG_SUPPORTED_OPTIONS= tests
+
+.include "../../mk/bsd.options.mk"
+
+# The following tests FAILED:
+#     1 - logging_custom_prefix (Subprocess aborted)
+#     3 - logging (Subprocess aborted)
+#     7 - symbolize (Subprocess aborted)
+#     11 - cmake_package_config_build (Failed)
+.if !empty(PKG_OPTIONS:Mtests)
+# googletest requires minimum c++14.
+TEST_TARGET=   test
+CMAKE_ARGS+=   -DBUILD_TESTING=ON
+USE_LANGUAGES+=        c++14
+.  include "../../devel/googletest/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -DBUILD_TESTING=OFF
+.endif