Skip to content

Commit

Permalink
support/download/cargo-post-process: cargo output for vendor config
Browse files Browse the repository at this point in the history
Use the output of `cargo vendor` to generate the vendor configuration.

Fixes the need to patch the generated configuration if there are
non-crates.io dependencies.

Note:
  `cargo vendor` currently prints a newline before it prints the
  needed configuration.

  This is fixed in +nightly, will end up in +stable soon and must
  be considered when updating cargo.
  See: rust-lang/cargo#11273

  Until then it is needed to remove this first line to make sure
  that the contents of .cargo/config will be the same as they were
  generated with the earlier version of the script. Thus, the
  hashes of the packages that use this script remain the same.

Signed-off-by: Simon Richter <simon.richter@ptwdosimetry.com>
[yann.morin.1998@free.fr: add comment in rust-bin.mk and rust.mk]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
  • Loading branch information
sionik authored and ccrisan committed Mar 30, 2023
1 parent 084415c commit 1212f87
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 0 deletions.
2 changes: 2 additions & 0 deletions package/rust-bin/rust-bin.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#
################################################################################

# When updating this version, check whether support/download/cargo-post-process
# still generates the same archives.
RUST_BIN_VERSION = 1.64.0
RUST_BIN_SITE = https://static.rust-lang.org/dist
RUST_BIN_LICENSE = Apache-2.0 or MIT
Expand Down
2 changes: 2 additions & 0 deletions package/rust/rust.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#
################################################################################

# When updating this version, check whether support/download/cargo-post-process
# still generates the same archives.
RUST_VERSION = 1.64.0
RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz
RUST_SITE = https://static.rust-lang.org/dist
Expand Down
50 changes: 50 additions & 0 deletions support/download/cargo-post-process
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#!/usr/bin/env bash

set -e
set -o pipefail

. "${0%/*}/helpers"

while getopts "n:o:" OPT; do
case "${OPT}" in
o) output="${OPTARG}";;
n) base_name="${OPTARG}";;
:) error "option '%s' expects a mandatory argument\n" "${OPTARG}";;
\?) error "unknown option '%s'\n" "${OPTARG}";;
esac
done

# Already vendored tarball, nothing to do
if tar tf "${output}" | grep -q "^[^/]*/VENDOR" ; then
exit 0
fi

post_process_unpack "${base_name}" "${output}"

# Do the Cargo vendoring
pushd "${base_name}" > /dev/null

# Create the local .cargo/config with vendor info
#
# The first line of the output to stdout is empty.
# So skip it to have the file start with the vendoring
# configuration (`tail --lines=+2`).
#
# NOTE:
# There is a patch for cargo to remove the first empty line:
# See: https://github.com/rust-lang/cargo/pull/11273
#
# The patch already landed in +nightly and will end up
# in +stable soon.
#
# -> When updating rust/cargo, the call to `tail` must be removed.
#
mkdir -p .cargo/
cargo vendor \
--manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} \
--locked VENDOR \
| tail --lines=+2 | tee .cargo/config

popd > /dev/null

post_process_repack "$(pwd)" "${base_name}" "${output}"

0 comments on commit 1212f87

Please sign in to comment.