pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust177/cargo.mk: pull across fix from main pkgsrc.
Module Name: pkgsrc-wip
Committed By: Havard Eidnes <he%NetBSD.org@localhost>
Pushed By: he
Date: Sun May 5 08:37:07 2024 +0000
Changeset: 916adf93875ce745790af59c794b41c9af96996c
Modified Files:
rust177/cargo.mk
Log Message:
rust177/cargo.mk: pull across fix from main pkgsrc.
move pkgsrc's generated cargo config to $WRKDIR.
Should fix build issue with py-bcrypt.
Thanks to tnn@
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=916adf93875ce745790af59c794b41c9af96996c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust177/cargo.mk | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diffs:
diff --git a/rust177/cargo.mk b/rust177/cargo.mk
index f48bdac474..1181957f5b 100644
--- a/rust177/cargo.mk
+++ b/rust177/cargo.mk
@@ -48,8 +48,8 @@ post-extract: cargo-vendor-crates
.PHONY: cargo-vendor-crates
cargo-vendor-crates:
@${STEP_MSG} "Extracting local cargo crates"
- ${RUN}${MKDIR} ${CARGO_WRKSRC}/.cargo
- ${RUN}${PRINTF} "[source.crates-io]\nreplace-with = \"vendored-sources\"\n[source.vendored-sources]\ndirectory = \"${CARGO_VENDOR_DIR}\"\n" > ${CARGO_WRKSRC}/.cargo/config
+ ${RUN}${MKDIR} ${WRKDIR}/.cargo
+ ${RUN}${PRINTF} "[source.crates-io]\nreplace-with = \"vendored-sources\"\n[source.vendored-sources]\ndirectory = \"${CARGO_VENDOR_DIR}\"\n" > ${WRKDIR}/.cargo/config.toml
${RUN}${MKDIR} ${CARGO_VENDOR_DIR}
.for crate in ${CARGO_CRATE_DEPENDS}
${RUN}${PRINTF} '{"package":"%s","files":{}}' \
@@ -78,6 +78,7 @@ CARGO_ARGS?= build --release ${DEFAULT_CARGO_ARGS}
CARGO_INSTALL_ARGS?= install --path . --root ${DESTDIR}${PREFIX} ${DEFAULT_CARGO_ARGS}
MAKE_ENV+= RUSTFLAGS=${RUSTFLAGS:Q}
+ALL_ENV+= CARGO_HOME=${WRKDIR}
.if !target(do-build)
do-build: do-cargo-build
Home |
Main Index |
Thread Index |
Old Index