pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust182: Fix Python dependency -- tool, not build, dependency.
Module Name: pkgsrc-wip
Committed By: Taylor R Campbell <riastradh%NetBSD.org@localhost>
Pushed By: riastradh
Date: Wed Feb 5 23:43:37 2025 +0000
Changeset: 8313d105931f683aa3108df6bf57b34decf6f9b8
Modified Files:
rust182/Makefile
Log Message:
rust182: Fix Python dependency -- tool, not build, dependency.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8313d105931f683aa3108df6bf57b34decf6f9b8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust182/Makefile | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diffs:
diff --git a/rust182/Makefile b/rust182/Makefile
index 11cb2833f4..695026e5ee 100644
--- a/rust182/Makefile
+++ b/rust182/Makefile
@@ -32,13 +32,13 @@ USE_TOOLS+= bash grep gmake perl:build pkg-config
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 -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"
@@ -541,13 +541,13 @@ 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}
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}
SUBST_CLASSES+= destdir
SUBST_STAGE.destdir= post-install
Home |
Main Index |
Thread Index |
Old Index