0031-tools-cmake-fix-parallel-build-with-Make-4.2.patch 945 B

123456789101112131415161718192021222324252627282930
  1. From: Matthias Schiffer <mschiffer@universe-factory.net>
  2. Date: Wed, 15 Jun 2016 19:31:49 +0200
  3. Subject: tools/cmake: fix parallel build with Make 4.2+
  4. Avoid using the --parallel argument to the CMake bootstrap, as that doesn't
  5. allow us to remove the -j argument. Instead, pass the HOST_JOBS arguments
  6. in MAKEFLAGS.
  7. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
  8. Backport of LEDE 96db10752483cb07f822686482b44be6c21fbb5f
  9. diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile
  10. index 08e2b02..6c211de 100644
  11. --- a/tools/cmake/Makefile
  12. +++ b/tools/cmake/Makefile
  13. @@ -18,10 +18,11 @@ HOST_CONFIGURE_PARALLEL:=1
  14. include $(INCLUDE_DIR)/host-build.mk
  15. +HOST_CONFIGURE_CMD := MAKEFLAGS="$(HOST_JOBS)" $(BASH) ./configure
  16. +
  17. HOST_CONFIGURE_VARS :=
  18. HOST_CONFIGURE_ARGS := \
  19. - --prefix=$(STAGING_DIR_HOST) \
  20. - $(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)")
  21. + --prefix=$(STAGING_DIR_HOST)
  22. $(eval $(call HostBuild))