diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-14 15:26:39 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-01 13:06:55 +0100 |
| commit | e050b09c7ef193da9da4441d9984c793e35b5a8a (patch) | |
| tree | 4dd5b57161afc89adc8399a8aaca9387cf397310 /solenv/Module_solenv.mk | |
| parent | 47cdd3ba605324072db617c6ae2d1a647b8bdce6 (diff) | |
gbuild: serialize dynamic link for static builds
This is a hack, because make has no way to serialize processing
of a target (just .NOTPARALLEL for the whole Makefile).
It uses the lockfile tool / liblockfile 1.17. Since that polls
the file, I adjusted the poll timeout to 5s max, because I found
the 60s wait much too long. Guess even 1s would be ok...
Since it's just a small build tool, I simply copied and patched
its source, instead of creating an external project. And there
is --with-system-lockfile=... to use an external binary instead.
Change-Id: I16bc4579a273dcf1aac811ae4723ca325a0b9eba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126152
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'solenv/Module_solenv.mk')
| -rw-r--r-- | solenv/Module_solenv.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk index 70eb5f9fb7c3..bbe6b5a97f32 100644 --- a/solenv/Module_solenv.mk +++ b/solenv/Module_solenv.mk @@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,solenv)) $(eval $(call gb_Module_add_targets_for_build,solenv,\ Executable_concat-deps \ Executable_gbuildtojson \ + $(if $(filter-out ANDROID MACOSX iOS WNT,$(OS)),Executable_lockfile) \ )) ifeq ($(COM),MSC) |