From 4e71afe8e71837cf413aae494b0958e73e4e9a7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 21 Oct 2024 11:24:55 +0200 Subject: [PATCH] d/rules: adapt to workspace additions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gbp-Dch: ignore Signed-off-by: Fabian Grünbichler --- debian/prune-unused-deps | 1 + debian/rules | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/prune-unused-deps b/debian/prune-unused-deps index 8bfd6c11ce..9faacf15b4 100755 --- a/debian/prune-unused-deps +++ b/debian/prune-unused-deps @@ -14,6 +14,7 @@ for i in "$scriptdir/debian/patches"/prune/d-00*.patch; do "$scriptdir/debian/ensure-patch" -N "$i" done +# keep in sync with d/rules workspaces=". src/bootstrap library src/tools/rust-analyzer src/tools/cargo src/tools/rustbook" for ws in $workspaces; do test -f "$ws/Cargo.lock.org" || cp "$ws/Cargo.lock" "$ws/Cargo.lock.orig" diff --git a/debian/rules b/debian/rules index 559f6b52e7..71f4380f17 100755 --- a/debian/rules +++ b/debian/rules @@ -275,7 +275,10 @@ debian/dh_auto_configure.stamp: debian/config.toml check-no-old-llvm extra-vendo if test $$(grep "127.0.0.1\s*localhost" /etc/hosts | wc -l) -gt 1; then \ debian/ensure-patch -N debian/patches-unused/d-test-host-duplicates.patch; fi # don't care about lock changes - rm -f Cargo.lock src/bootstrap/Cargo.lock src/tools/rust-analyzer/Cargo.lock src/tools/cargo/Cargo.lock + # keep in sync with d/prune-unused-deps + for ws in . src/bootstrap library src/tools/rust-analyzer src/tools/cargo src/tools/rustbook; do \ + rm -f "$$ws/Cargo.lock"; \ + done # We patched some crates so have to rm the checksums find vendor -name .cargo-checksum.json -execdir "$(CURDIR)/debian/prune-checksums" "{}" + # Link against system liblzma, see https://github.com/alexcrichton/xz2-rs/issues/16