Re: doxygen build failing with python confusion

[Greg Troxel <gdt%lexort.com@localhost>]

Thomas Klausner <wiz%NetBSD.org@localhost> writes:

> Changing lang/python/*.mk in some way is fine with me if you think it
> necessary right now.

This diff solves the issue; doxygen builds fine with it.  I see it as
fixing a bug in the USE_CMAKE->cmake/build.mk transition, for python.

We can do a more invasive change with a cleaner result post-branch.


Index: devel/cmake/build.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/cmake/build.mk,v
retrieving revision 1.7
diff -u -p -r1.7 build.mk
--- devel/cmake/build.mk	25 Jan 2023 16:46:37 -0000	1.7
+++ devel/cmake/build.mk	25 Mar 2023 18:21:40 -0000
@@ -43,6 +43,10 @@ CMAKE_REQD?=	0
 TOOL_DEPENDS+=	cmake>=${version}:../../devel/cmake
 .endfor
 
+# Declare that this package is using cmake, for bl3 files to know
+# to add to CMAKE_CONFIGURE_ARGS.
+BUILD_USES_CMAKE=	yes
+
 CMAKE_CONFIGURE_ARGS?=	${CMAKE_ARGS}
 
 CONFIGURE_ENV+=		BUILDLINK_DIR=${BUILDLINK_DIR}
Index: lang/python/pyversion.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python/pyversion.mk,v
retrieving revision 1.146
diff -u -p -r1.146 pyversion.mk
--- lang/python/pyversion.mk	12 Jan 2023 10:56:12 -0000	1.146
+++ lang/python/pyversion.mk	25 Mar 2023 18:21:40 -0000
@@ -211,7 +211,7 @@ PRINT_PLIST_AWK+=	/^${PYLIB:S|/|\\/|g}/ 
 			{ gsub(/${PYLIB:S|/|\\/|g}/, "$${PYLIB}") }
 
 ALL_ENV+=		PYTHON=${PYTHONBIN}
-.if defined(USE_CMAKE)
+.if defined(USE_CMAKE) || defined(BUILD_USES_CMAKE)
 # used by FindPython
 CMAKE_ARGS+=		-DPython_EXECUTABLE:FILEPATH=${PYTHONBIN}
 CMAKE_ARGS+=		-DPython_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
@@ -238,7 +238,7 @@ _VARGROUPS+=		pyversion
 _USER_VARS.pyversion=	PYTHON_VERSION_DEFAULT
 _PKG_VARS.pyversion=	\
 	PYTHON_VERSIONS_ACCEPTED PYTHON_VERSIONS_INCOMPATIBLE		\
-	PYTHON_SELF_CONFLICT PYTHON_FOR_BUILD_ONLY USE_CMAKE
+	PYTHON_SELF_CONFLICT PYTHON_FOR_BUILD_ONLY USE_CMAKE BUILD_USES_CMAKE
 _SYS_VARS.pyversion=	\
 	PYTHON_VERSION_REQD PYPACKAGE PYVERSSUFFIX PYPKGSRCDIR		\
 	PYPKGPREFIX PYTHONBIN PYTHONCONFIG PY_COMPILE_ALL		\