diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-09-27 12:26:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-09-27 15:03:19 +0200 |
| commit | 36fcb8dc0c0c1c9515cdf47ce74a272469c17087 (patch) | |
| tree | c9a337c3bf90587bcc946bdb31898d3917474f98 /odk | |
| parent | b3a251d5f4846eee3387103b8e4e89eefdabb0d9 (diff) | |
Restrict odk/examples to non-parallel make
At least odk/examples/DevelopersGuide/Spreadsheet/Makefile contains two
independent invocations of unopkg (i.e., $(DEPLOYTOOL)) and
CustomTarget_odk/build-examples_java had once failed for me with
> "~/lo/core/instdir/program/unopkg" add -f "~/lo/core/workdir/CustomTarget/odk/build-examples_java/out/sdk/LINUXexample.out/bin/ExampleDataPilotSource.oxt"
> ERROR: unopkg cannot be started. The lock file indicates it is already running. If this does not apply, delete the lock file at:
> ~/lo/core/workdir/CustomTarget/odk/build-examples_java/user/.lock ~/lo/core/desktop/source/pkgchk/unopkg/unopkg_shared.h:44
> make[2]: *** [Makefile:227: ~/lo/core/workdir/CustomTarget/odk/build-examples_java/out/sdk/LINUXexample.out/misc/DevGuideSpreadsheetExamples/devguide_ExampleDataPilotSource_register_component.flag] Error 1
So make sure the `make` invoked from those CustomTarget_odk/build_exmaple* does
not inherit any -j flag from the outer `make`. (I had observed this with an
explicit `make -j4` and --without-parallelism, but this should also be an issue
for the implicit parallelism from the default --with-parallelism.)
Change-Id: Iff368dbbcad01d3841d63c2985639ba6a3dec1f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103504
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/build-examples_common.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/odk/build-examples_common.mk b/odk/build-examples_common.mk index abcb3a3e2593..08b8d5e3c231 100644 --- a/odk/build-examples_common.mk +++ b/odk/build-examples_common.mk @@ -46,7 +46,7 @@ else UserInstallation=$(call gb_Helper_make_url,$(call gb_CustomTarget_get_workdir,$(1))/user) \ $(foreach my_dir,$(2), \ && (cd $(INSTDIR)/$(SDKDIRNAME)/examples/$(my_dir) \ - && printf 'yes\n' | LC_ALL=C make \ + && printf 'yes\n' | LC_ALL=C make -j1 \ CC="$(CXX)" LINK="$(CXX)" LIB="$(CXX)" \ $(if $(MACOSX_SHELL_HACK), SHELL="$$$$ODK_BUILD_SHELL", ))) \ $(if $(MACOSX_SHELL_HACK),&& rm -f "$$$$ODK_BUILD_SHELL")) \ |