sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mk/Uses/cargo.mk: Use canonical crate file extension going forward

Browse source 
Crates should have the file extension .crate not .tar.gz.  Cargo
saves them with that extension and it is also what their original
name was according to file(1):

$ file rust/crates/*
rust/crates/better-panic-0.2.0.tar.gz:gzip compressed data, was "better-panic-0.2.0.crate"
rust/crates/binary-space-partition-0.1.2.tar.gz:gzip compressed data, was "binary-space-partition-0.1.2.crate"
...

The only reason we used .tar.gz is that it was that way in OpenBSD's
devel/cargo/cargo.port.mk module.  At the moment they are all .tar.gz
but they might have a different format in the future.

Doing a delayed rollout of this over a change-everything-once
approach to

- not immeditately invalidate all uncommitted port changes or
  external ports
- not make sweeping changes twice in main and 2021Q2

at the cost of having a transition period where mirrors might have
to carry both the .tar.gz and .crate tarballs (all crates combined
are ~600 MiB).

Reviewed by:	jbeich
MFH:		2021Q2 (to ease future cherry picks)
Differential Revision:	https://reviews.freebsd.org/D29760
This commit is contained in:
Tobias Kortkamp 2021-04-17 07:27:24 +02:00
parent 7b784406af
commit 3758b337a1
No known key found for this signature in database
GPG key ID: A4F09FB73CC51F61
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Mk/Uses/cargo.mk
View file

@ -34,10 +34,20 @@ CARGO_CARGOLOCK?= ${WRKSRC}/Cargo.lock
CARGO_DIST_SUBDIR?= rust/crates
# Generate list of DISTFILES.
# Prefer canonical file extension .crate going forward
.if make(makesum)
CARGO_CRATE_EXT= .crate
.else
# If there is a rust/crates/*.tar.gz in distinfo keep using the old
# extension. We need to delay eval until the last moment for
# DISTINFO_FILE. We cache the command output to avoid multiple
# slow grep runs for every CARGO_CRATE_EXT access.
CARGO_CRATE_EXT= ${defined(_CARGO_CRATE_EXT_CACHE):?${_CARGO_CRATE_EXT_CACHE}:${:!if ${GREP} -q '\(${CARGO_DIST_SUBDIR}/.*\.tar\.gz\)' "${DISTINFO_FILE}" 2>/dev/null; then ${ECHO_CMD} .tar.gz; else ${ECHO_CMD} .crate; fi!:_=_CARGO_CRATE_EXT_CACHE}}
.endif
.for _crate in ${CARGO_CRATES}
# Resolving CRATESIO alias is very inefficient with many MASTER_SITES, consume MASTER_SITE_CRATESIO directly
MASTER_SITES+= ${MASTER_SITE_CRATESIO:S,%SUBDIR%,${_crate:C/^([-_a-zA-Z0-9]+)-[0-9].*/\1/}/${_crate:C/^[-_a-zA-Z0-9]+-([0-9].*)/\1/},:S,$,:cargo_${_crate:C/[^a-zA-Z0-9_]//g},}
DISTFILES+= ${CARGO_DIST_SUBDIR}/${_crate}.tar.gz:cargo_${_crate:C/[^a-zA-Z0-9_]//g}
DISTFILES+= ${CARGO_DIST_SUBDIR}/${_crate}${CARGO_CRATE_EXT}:cargo_${_crate:C/[^a-zA-Z0-9_]//g}
.endfor
# Build dependencies.
@ -211,7 +221,7 @@ cargo-extract:
.for _crate in ${CARGO_CRATES}
@${MV} ${WRKDIR}/${_crate} ${CARGO_VENDOR_DIR}/${_crate}
@${PRINTF} '{"package":"%s","files":{}}' \
$$(${SHA256} -q ${DISTDIR}/${CARGO_DIST_SUBDIR}/${_crate}.tar.gz) \
$$(${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 \