CVS commit: pkgsrc/devel/hdf5-c++

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Mar  6 13:09:53 UTC 2025

Modified Files:
        pkgsrc/devel/hdf5-c++: Makefile

Log Message:
devel/hdf5-c++: Override user CMAKE_GENERATOR harder

Include bsd.prefs.mk, so that if the user set it unconditionally, oor
assignment will prevail.  As discussed on pkgsrc-users@.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/hdf5-c++/Makefile

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

Modified files:

Index: pkgsrc/devel/hdf5-c++/Makefile
diff -u pkgsrc/devel/hdf5-c++/Makefile:1.11 pkgsrc/devel/hdf5-c++/Makefile:1.12
--- pkgsrc/devel/hdf5-c++/Makefile:1.11 Wed Mar  5 17:28:32 2025
+++ pkgsrc/devel/hdf5-c++/Makefile      Thu Mar  6 13:09:53 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2025/03/05 17:28:32 gdt Exp $
+# $NetBSD: Makefile,v 1.12 2025/03/06 13:09:53 gdt Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-c++-/}
 COMMENT=       Hierarchical Data Format (new generation) - C++ wrappers
@@ -9,7 +9,15 @@ BUILD_DIRS+=   c++
 USE_LANGUAGES=         c c++
 
 CMAKE_CONFIGURE_ARGS+= -DHDF5_BUILD_CPP_LIB=ON
-# BUILD_DIRS (at least for hdf5) is not compatible with ninja
+
+# BUILD_DIRS (at least for hdf5) is not compatible with ninja.  pkgsrc
+# does not support CMAKE_GENERATORS_ACCEPTED=make as a
+# package-settable variable to indicate that only make works, so we
+# have to abuse CMAKE_GENERATOR (a user-settable variable).  That
+# might be set with = in mk.conf, and if so we want to just override
+# it, as being more helpful than erroring.  We therefore force reading
+# prefs first so that our assignment will prevail.
+.include "../../mk/bsd.prefs.mk"
 CMAKE_GENERATOR=       make
 
 .include "../../devel/hdf5/Makefile.common"