Skip to content
Snippets Groups Projects
Select Git revision
  • fd237f6f43d4ad36e1987bf7461a16647287db18
  • v2018.2.x default protected
  • 0x4A6F-rpi4
  • 0x4A6F-master
  • master
  • v2018.2.2-ffs
  • v2016.2.4-batmanbug
  • radv-filterd
  • v2016.2.x
  • hoodselector
  • v2016.1.x
  • babel
  • v2015.1.x
  • 2014.4.x
  • 2014.3.x
  • v2018.2.2-ffs0.1
  • v2018.2.1-ffs0.1
  • v2018.2.1
  • v2018.2-ffs0.1
  • v2018.2
  • v2018.1.4
  • v2018.1.3
  • v2018.1.2
  • v2018.1.1
  • v2018.1
  • v2017.1.8
  • v2017.1.7
  • v2017.1.6
  • v2017.1.5
  • v2017.1.4
  • v2017.1.3
  • v2017.1.2
  • v2016.2.7
  • v2017.1.1
  • v2017.1
35 results

0086-build-don-t-add-j-for-parallel-builds-with-Make-4.2.patch

  • Forked from firmware / FFS Gluon
    Source project has a limited visibility.
    0086-build-don-t-add-j-for-parallel-builds-with-Make-4.2.patch 1.89 KiB
    From: Matthias Schiffer <mschiffer@universe-factory.net>
    Date: Wed, 15 Jun 2016 19:31:34 +0200
    Subject: build: don't add -j for parallel builds with Make 4.2+
    
    Make usually passes -j and jobserver arguments as part of MAKEFLAGS. LEDE
    removes MAKEFLAGS to have better control of the build, and re-adds the
    jobserver arguments with -j to the Make commandline where desired.
    
    Make 4.2+ behave differently with these arguments passed on the commandline
    than in MAKEFLAGS: -j will override the jobserver argument and the job
    count will be unlimited.
    
    Moving the flags to MAKEFLAGS will need many packages to be changed and
    tested; therefore, we opt for a less invasive change for now and just
    remove -j for Make 4.2+, as the jobserver argument alone is enough to
    enable parallel builds for these Make versions.
    
    Signed-off-by: Jo-Philipp Wich <jo@mein.io>
    Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
    
    Backport of LEDE 6fb212f2933bbbdf2935124205717c9d0ca72b32
    
    diff --git a/include/host-build.mk b/include/host-build.mk
    index e2b5f2f..44401b8 100644
    --- a/include/host-build.mk
    +++ b/include/host-build.mk
    @@ -10,7 +10,7 @@ HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install
     HOST_BUILD_PARALLEL ?=
     
     ifneq ($(CONFIG_PKG_BUILD_USE_JOBSERVER),)
    -  HOST_MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) -j)
    +  HOST_MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) $(if $(filter 3.% 4.0 4.1,$(MAKE_VERSION)),-j))
     else
       HOST_MAKE_J:=-j$(CONFIG_PKG_BUILD_JOBS)
     endif
    diff --git a/include/package.mk b/include/package.mk
    index c69d928..a99cdc6 100644
    --- a/include/package.mk
    +++ b/include/package.mk
    @@ -23,7 +23,7 @@ PKG_RELRO_PARTIAL ?= 1
     PKG_RELRO_FULL ?= 1
     
     ifneq ($(CONFIG_PKG_BUILD_USE_JOBSERVER),)
    -  MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) -j)
    +  MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) $(if $(filter 3.% 4.0 4.1,$(MAKE_VERSION)),-j))
     else
       MAKE_J:=-j$(CONFIG_PKG_BUILD_JOBS)
     endif