CVS commit: pkgsrc/lang/rust

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Thu Feb  6 13:34:44 UTC 2025

Modified Files:
        pkgsrc/lang/rust: Makefile

Log Message:
lang/rust: 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 generate a diff of this commit:
cvs rdiff -u -r1.322 -r1.323 pkgsrc/lang/rust/Makefile

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

Modified files:

Index: pkgsrc/lang/rust/Makefile
diff -u pkgsrc/lang/rust/Makefile:1.322 pkgsrc/lang/rust/Makefile:1.323
--- pkgsrc/lang/rust/Makefile:1.322     Sun Feb  2 13:34:47 2025
+++ pkgsrc/lang/rust/Makefile   Thu Feb  6 13:34:44 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.322 2025/02/02 13:34:47 he Exp $
+# $NetBSD: Makefile,v 1.323 2025/02/06 13:34:44 riastradh Exp $
 
 DISTNAME=      rustc-1.82.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -32,13 +32,13 @@ USE_TOOLS+=         bash grep gmake perl:build 
 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.
@@ -528,12 +528,12 @@ do-build:
        ${SETENV} ${MAKE_ENV}                                           \
        sh -c "if [ \"${BUILD_TARGET}\" = \"dist\" ]; then              \
                unset DESTDIR;                                          \
-               ${PYTHONBIN} ./x.py                                     \
+               ${TOOL_PYTHONBIN} ./x.py                                \
                    ${BUILD_TARGET} -j ${_MAKE_JOBS_N};                 \
        else                                                            \
-               ${PYTHONBIN} ./x.py                                     \
+               ${TOOL_PYTHONBIN} ./x.py                                \
                    ${BUILD_TARGET} --stage 2 -j ${_MAKE_JOBS_N} &&     \
-               ${PYTHONBIN} ./x.py                                     \
+               ${TOOL_PYTHONBIN} ./x.py                                \
                    doc --stage 2 -j ${_MAKE_JOBS_N};                   \
        fi"
 
@@ -541,13 +541,13 @@ do-test:
        ${RUN}${_ULIMIT_CMD}                                            \
        cd ${WRKSRC} &&                                                 \
        ${SETENV} ${MAKE_ENV}                                           \
-               ${PYTHONBIN} ./x.py test -j ${_MAKE_JOBS_N}
+               ${TOOL_PYTHONBIN} ./x.py test -j ${_MAKE_JOBS_N}
 
 do-install:
        ${RUN}${_ULIMIT_CMD}                                            \
        cd ${WRKSRC} &&                                                 \
        ${SETENV} ${MAKE_ENV} ${INSTALL_ENV}                            \
-               ${PYTHONBIN} ./x.py install -j ${_MAKE_JOBS_N}
+               ${TOOL_PYTHONBIN} ./x.py install -j ${_MAKE_JOBS_N}
 
 SUBST_CLASSES+=                destdir
 SUBST_STAGE.destdir=   post-install
@@ -682,8 +682,8 @@ TOOL_DEPENDS+=      compat80>=0:../../emulato
 DEPENDS+=      libatomic-links>=0:../../devel/libatomic-links
 .endif
 
-TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
-.include "../../devel/cmake/buildlink3.mk"
+TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"