From e050b09c7ef193da9da4441d9984c793e35b5a8a Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Fri, 14 May 2021 15:26:39 +0200 Subject: 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 --- solenv/gbuild/extensions/pre_BuildTools.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'solenv/gbuild/extensions/pre_BuildTools.mk') diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk index 84e2ea533673..8481a3785637 100644 --- a/solenv/gbuild/extensions/pre_BuildTools.mk +++ b/solenv/gbuild/extensions/pre_BuildTools.mk @@ -24,6 +24,7 @@ gb_BUILD_TOOLS_executables = \ helpex \ idxdict \ javamaker \ + $(if $(filter-out ANDROID MACOSX iOS WNT,$(OS)),lockfile) \ makedepend \ propex \ saxparser \ -- cgit