Date: Sun, 7 Jan 2024 15:15:48 GMT From: Joel Bodenmann <jbo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c2e360d6257f - main - Mk/Uses/cargo.mk: Fix cargo-extract target Message-ID: <202401071515.407FFm42061024@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbo: URL: https://cgit.FreeBSD.org/ports/commit/?id=c2e360d6257f5c5ee9812fe996337d2da6150947 commit c2e360d6257f5c5ee9812fe996337d2da6150947 Author: Dmitry Wagin <dmitry.wagin@ya.ru> AuthorDate: 2023-12-31 17:58:41 +0000 Commit: Joel Bodenmann <jbo@FreeBSD.org> CommitDate: 2024-01-07 15:14:10 +0000 Mk/Uses/cargo.mk: Fix cargo-extract target Fix an issue where the cargo-extract target fails when a port sets DIST_SUBDIR. PR: 275634 Approved by: tcberner (mentor), rust (tobik) Differential Revision: https://reviews.freebsd.org/D43259 --- Mk/Uses/cargo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index b0c900dda8ca..2365e7620133 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -284,7 +284,7 @@ cargo-extract: . if ${_index} != @git @${MV} ${WRKDIR}/${_crate} ${CARGO_VENDOR_DIR}/${_crate} @${PRINTF} '{"package":"%s","files":{}}' \ - $$(${SHA256} -q ${DISTDIR}/${CARGO_DIST_SUBDIR}/${_crate}${CARGO_CRATE_EXT}) \ + $$(${SHA256} -q ${_DISTDIR}/${CARGO_DIST_SUBDIR}/${_crate}${CARGO_CRATE_EXT}) \ > ${CARGO_VENDOR_DIR}/${_crate}/.cargo-checksum.json @if [ -r ${CARGO_VENDOR_DIR}/${_crate}/Cargo.toml.orig ]; then \ ${MV} ${CARGO_VENDOR_DIR}/${_crate}/Cargo.toml.orig \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401071515.407FFm42061024>