Makefile.fetch | 2 +-
external/y-crdt/ExternalProject_y-crdt.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 524f5ca8e022399aa77528ec8c8bc4c84323e34b
Author: Rene Engelhard <r...@rene-engelhard.de>
AuthorDate: Wed Jun 25 23:48:58 2025 +0200
Commit: René Engelhard <r...@rene-engelhard.de>
CommitDate: Wed Jul 2 11:06:32 2025 +0200
add --verbose for cargo calls if we want verbose output
Change-Id: I294f10ad63dec376a9631ed7dee5b79a5b747e6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187011
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@collabora.com>
diff --git a/Makefile.fetch b/Makefile.fetch
index 239fcc01753f..09e9cd930681 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -253,7 +253,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
,$(call
fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item)))
-@mkdir -p $(TARFILE_LOCATION)/cargo
$(if $(call fetch_Optional,YRS,1),\
- CARGO_HOME=$(TARFILE_LOCATION)/cargo cargo fetch --locked
--manifest-path $(SRCDIR)/external/y-crdt/Cargo.toml)
+ CARGO_HOME=$(TARFILE_LOCATION)/cargo cargo fetch $(if
$(verbose),--verbose,) --locked --manifest-path
$(SRCDIR)/external/y-crdt/Cargo.toml)
@mkdir -p $(dir $@) && touch $@
@mkdir -p $(dir $@)/Executable
diff --git a/external/y-crdt/ExternalProject_y-crdt.mk
b/external/y-crdt/ExternalProject_y-crdt.mk
index dce34d6a133e..4b763ece948e 100644
--- a/external/y-crdt/ExternalProject_y-crdt.mk
+++ b/external/y-crdt/ExternalProject_y-crdt.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,y-crdt,\
$(call gb_ExternalProject_get_state_target,y-crdt,build):
$(call gb_Trace_StartRange,y-crdt,EXTERNAL)
$(call gb_ExternalProject_run,build,\
- CARGO_HOME=$(TARFILE_LOCATION)/cargo cargo build --offline
--locked -p yffi \
+ CARGO_HOME=$(TARFILE_LOCATION)/cargo cargo build $(if
$(verbose),--verbose,) --offline --locked -p yffi \
)
$(call gb_Trace_EndRange,y-crdt,EXTERNAL)
