CVS commit: pkgsrc/graphics/libhighway

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Aug 16 15:20:49 UTC 2023

Modified Files:
        pkgsrc/graphics/libhighway: Makefile buildlink3.mk
Added Files:
        pkgsrc/graphics/libhighway: options.mk

Log Message:
libhighway: Option-ize googletest dependency for ABI reasons
(same as other packages, it's a dependency that might require a much
newer compiler)

While here, add missing libatomic dependency


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/libhighway/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/libhighway/buildlink3.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/libhighway/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/graphics/libhighway/Makefile
diff -u pkgsrc/graphics/libhighway/Makefile:1.3 pkgsrc/graphics/libhighway/Makefile:1.4
--- pkgsrc/graphics/libhighway/Makefile:1.3     Mon Nov 21 18:20:43 2022
+++ pkgsrc/graphics/libhighway/Makefile Wed Aug 16 15:20:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/11/21 18:20:43 jperkin Exp $
+# $NetBSD: Makefile,v 1.4 2023/08/16 15:20:49 nia Exp $
 
 DISTNAME=      highway-1.0.1
 PKGNAME=       lib${DISTNAME}
@@ -30,6 +30,6 @@ BUILDLINK_TRANSFORM.SunOS+=   rm:-Wl,--ver
 MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}
 TEST_TARGET=   test
 
-BUILDLINK_API_DEPENDS.googletest+=     googletest>=1.10.0nb1
-.include "../../devel/googletest/buildlink3.mk"
+.include "options.mk"
+.include "../../devel/libatomic/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/libhighway/buildlink3.mk
diff -u pkgsrc/graphics/libhighway/buildlink3.mk:1.2 pkgsrc/graphics/libhighway/buildlink3.mk:1.3
--- pkgsrc/graphics/libhighway/buildlink3.mk:1.2        Fri Oct  7 11:15:54 2022
+++ pkgsrc/graphics/libhighway/buildlink3.mk    Wed Aug 16 15:20:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2022/10/07 11:15:54 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2023/08/16 15:20:49 nia Exp $
 
 BUILDLINK_TREE+=       libhighway
 
@@ -8,8 +8,6 @@ LIBHIGHWAY_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.libhighway+=     libhighway>=0.12.2
 BUILDLINK_ABI_DEPENDS.libhighway+=     libhighway>=1.0.1
 BUILDLINK_PKGSRCDIR.libhighway?=       ../../graphics/libhighway
-
-.include "../../devel/googletest/buildlink3.mk"
 .endif # LIBHIGHWAY_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libhighway

Added files:

Index: pkgsrc/graphics/libhighway/options.mk
diff -u /dev/null pkgsrc/graphics/libhighway/options.mk:1.1
--- /dev/null   Wed Aug 16 15:20:49 2023
+++ pkgsrc/graphics/libhighway/options.mk       Wed Aug 16 15:20:49 2023
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2023/08/16 15:20:49 nia Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.libhighway
+
+PKG_SUPPORTED_OPTIONS= tests
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mtests)
+TEST_TARGET=   test
+CMAKE_ARGS+=   -DBUILD_TESTING=ON
+BUILDLINK_API_DEPENDS.googletest+=     googletest>=1.10.0nb1
+.  include "../../devel/googletest/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -DBUILD_TESTING=OFF
+.endif