From c91d04121eb3a96b40690f6bc0e112fa4829b8fb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 10 Oct 2022 14:18:46 +0200 Subject: [PATCH] d/rules: also clear bootstrap/rust-analyzer Cargo.lock MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit they might have vendored slightly different versions than the main workspace, but we pruned those at tarball generation. Signed-off-by: Fabian Grünbichler --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 811443eebf..a61016c011 100755 --- a/debian/rules +++ b/debian/rules @@ -228,7 +228,7 @@ debian/dh_auto_configure.stamp: debian/config.toml check-no-old-llvm if test $$(grep "127.0.0.1\s*localhost" /etc/hosts | wc -l) -gt 1; then \ debian/ensure-patch -N debian/patches/d-test-host-duplicates.patch; fi # don't care about lock changes - rm -f Cargo.lock + rm -f Cargo.lock src/bootstrap/Cargo.lock src/tools/rust-analyzer/Cargo.lock # 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 -- 2.39.5