From 4c66610b96398f705090aa7d50b3b7c5b9747b2c Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 19 Oct 2015 09:20:03 +0100 Subject: [PATCH] tdf#95169 - copy snk files before using them to link. Ideally this should not be necessary; apparently something takes an exclusive lock which messes with parallel 'al' invocation using the SNK key file. Change-Id: Id4d5818a734a5591f826af230b71839dc076bb1f Reviewed-on: https://gerrit.libreoffice.org/19442 Tested-by: Jenkins Reviewed-by: Michael Meeks Tested-by: Michael Meeks --- solenv/gbuild/CliAssembly.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk index a745e8e1ec64..514bf368d63b 100644 --- a/solenv/gbuild/CliAssembly.mk +++ b/solenv/gbuild/CliAssembly.mk @@ -55,13 +55,15 @@ gb_CliAssemblyTarget_KEYFILE_DEFAULT := $(SRCDIR)/cli_ure/source/cliuno.snk define gb_CliAssemblyTarget__command $(call gb_Output_announce,$(2),$(true),AL ,2) $(call gb_Helper_abbreviate_dirs,\ + $(GNUCOPY) $(CLI_ASSEMBLY_KEYFILE) $(1).tmp.snk && \ al \ -nologo \ -out:$(CLI_ASSEMBLY_OUTFILE) \ -version:$(CLI_ASSEMBLY_VERSION) \ - -keyfile:$(CLI_ASSEMBLY_KEYFILE) \ + -keyfile:$(1).tmp.snk \ -link:$(CLI_ASSEMBLY_CONFIGFILE) \ $(if $(CLI_ASSEMBLY_PLATFORM),-platform:$(CLI_ASSEMBLY_PLATFORM)) && \ + rm -f $(1).tmp/snk && \ touch $(1) \ ) endef