rust183: Need python and cmake as tool deps, not build deps.

[Taylor R Campbell (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Taylor R Campbell <riastradh%NetBSD.org@localhost>
Pushed By:	riastradh
Date:		Mon Jan 20 10:26:53 2025 +0000
Changeset:	7a3d71ca272485bb0c864ab3fc54b8d7849ba2fb

Modified Files:
	rust183/Makefile

Log Message:
rust183: Need python and cmake as tool deps, not build deps.

These are both executed natively as tools at build-time; we don't use
cross-built Python or cmake for reference like a header file or
library at build-time.

Use TOOL_PYTHONBIN (path to Python executable which we can run at
build-time), not PYTHONBIN (path to Python executable to be baked
into the package for use at at run-time).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7a3d71ca272485bb0c864ab3fc54b8d7849ba2fb

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

diffstat:
 rust183/Makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diffs:
diff --git a/rust183/Makefile b/rust183/Makefile
index cba5ce52bb..8b8f2d012d 100644
--- a/rust183/Makefile
+++ b/rust183/Makefile
@@ -36,13 +36,13 @@ FORCE_RPATH=		--force-rpath
 BROKEN_ON_PLATFORM+=	NetBSD-[1-8].*-*
 
 HAS_CONFIGURE=		yes
-PYTHON_FOR_BUILD_ONLY=	yes
-CONFIG_SHELL=		${PYTHONBIN}
+PYTHON_FOR_BUILD_ONLY=	tool
+CONFIG_SHELL=		${TOOL_PYTHONBIN}
 CONFIGURE_SCRIPT=	src/bootstrap/configure.py
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--python=${PYTHONBIN}
+CONFIGURE_ARGS+=	--python=${TOOL_PYTHONBIN}
 CONFIGURE_ARGS+=	--release-channel=stable
 CONFIGURE_ARGS+=	--local-rust-root=${RUST_BOOTSTRAP_PATH}
 CONFIGURE_ARGS+=	--enable-extended	# Build and install cargo too.
@@ -533,12 +533,12 @@ do-build:
 	${SETENV} ${MAKE_ENV}						\
 	sh -c "if [ \"${BUILD_TARGET}\" = \"dist\" ]; then		\
 		unset DESTDIR;						\
-		${PYTHONBIN} ./x.py -v					\
+		${TOOL_PYTHONBIN} ./x.py -v				\
 		    ${BUILD_TARGET} -j ${_MAKE_JOBS_N};			\
 	else								\
-		${PYTHONBIN} ./x.py -v					\
+		${TOOL_PYTHONBIN} ./x.py -v				\
 		    ${BUILD_TARGET} --stage 2 -j ${_MAKE_JOBS_N} &&	\
-		${PYTHONBIN} ./x.py -v					\
+		${TOOL_PYTHONBIN} ./x.py -v				\
 		    doc --stage 2 -j ${_MAKE_JOBS_N};			\
 	fi"
 
@@ -546,7 +546,7 @@ do-test:
 	${RUN}${_ULIMIT_CMD}						\
 	cd ${WRKSRC} &&							\
 	${SETENV} ${MAKE_ENV}						\
-		${PYTHONBIN} ./x.py -v test -j ${_MAKE_JOBS_N}
+		${TOOL_PYTHONBIN} ./x.py -v test -j ${_MAKE_JOBS_N}
 
 PATCH_BINARIES+=	bin/cargo
 PATCH_BINARIES+=	bin/cargo-clippy
@@ -561,7 +561,7 @@ do-install:
 	${RUN}${_ULIMIT_CMD}						\
 	cd ${WRKSRC} &&							\
 	${SETENV} ${MAKE_ENV} ${INSTALL_ENV} 				\
-		${PYTHONBIN} ./x.py -v install -j ${_MAKE_JOBS_N};	\
+		${TOOL_PYTHONBIN} ./x.py -v install -j ${_MAKE_JOBS_N};	\
 	for bin in ${PATCH_BINARIES}; do				\
 		f=${DESTDIR}${PREFIX}/$${bin};				\
 		if [ -f $$f ]; then					\
@@ -705,7 +705,7 @@ DEPENDS+=	libatomic-links>=0:../../devel/libatomic-links
 .endif
 
 TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
-.include "../../devel/cmake/buildlink3.mk"
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"