[librsvg/librsvg-2.44] Makefile.am: Call "cargo --locked" so it won't try to update the lockfile inadvertently
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg/librsvg-2.44] Makefile.am: Call "cargo --locked" so it won't try to update the lockfile inadvertently
- Date: Sat, 16 Feb 2019 00:28:50 +0000 (UTC)
commit 0ac36efa41c252a142eff96b507d3d88f79417b2
Author: Federico Mena Quintero <federico gnome org>
Date: Fri Feb 15 18:27:46 2019 -0600
Makefile.am: Call "cargo --locked" so it won't try to update the lockfile inadvertently
Especially during "make distcheck", when the srcdir is read-only and
trying to write to the lockfile will fail.
The idea is to "cargo update" by hand, anyway.
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9f608543..e075c958 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -141,7 +141,7 @@ CARGO_TARGET_DIR=@abs_top_builddir@/target
check-local:
cd $(srcdir) && \
- CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) $(CARGO) test $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS)
$(CARGO_RELEASE_ARGS)
+ CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) $(CARGO) --locked test $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS)
$(CARGO_RELEASE_ARGS)
clean-local:
cd $(top_srcdir) && \
@@ -165,7 +165,7 @@ $(RUST_LIB): $(RUST_SRC)
PKG_CONFIG_ALLOW_CROSS=1 \
PKG_CONFIG='$(PKG_CONFIG)' \
CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \
- $(CARGO) build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS)
+ $(CARGO) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS)
librsvg_@RSVG_API_MAJOR_VERSION@_la_CPPFLAGS = \
-I$(top_srcdir) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]