Changeset 33523


Ignore:
Timestamp:
2012-09-23T11:50:01+02:00 (5 years ago)
Author:
nbd
Message:

build: add the + token to any commands that can pass through the jobserver, fixes parallel build on some systems

Location:
trunk
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/host-build.mk

    r33509 r33523  
    8181 
    8282define Host/Configure/Default 
    83         (cd $(HOST_BUILD_DIR)/$(3); \ 
     83        $(if $(HOST_CONFIGURE_PARALLEL),+)(cd $(HOST_BUILD_DIR)/$(3); \ 
    8484                if [ -x configure ]; then \ 
    8585                        $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/$(3)/ && \ 
    … …  
    9898 
    9999define Host/Compile/Default 
    100         $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \ 
     100        +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \ 
    101101                $(HOST_MAKE_FLAGS) \ 
    102102                $(1) 

  • trunk/include/package-defaults.mk

    r33480 r33523  
    130130 
    131131define Build/Compile/Default 
    132         $(MAKE_VARS) \ 
     132        +$(MAKE_VARS) \ 
    133133        $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ 
    134134                $(MAKE_FLAGS) \ 

  • trunk/package/busybox/Makefile

    r33475 r33523  
    8181 
    8282define Build/Compile 
    83         $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ 
     83        +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ 
    8484                CC="$(TARGET_CC)" \ 
    8585                CROSS_COMPILE="$(TARGET_CROSS)" \ 

  • trunk/package/dropbear/Makefile

    r30714 r33523  
    7777 
    7878define Build/Compile 
    79         $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ 
     79        +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ 
    8080                $(TARGET_CONFIGURE_OPTS) \ 
    8181                LD="$(TARGET_CC)" \ 
    8282                PROGRAMS="dropbear dbclient dropbearkey scp" \ 
    8383                MULTI=1 SCPPROGRESS=1 
    84         $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ 
     84        +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ 
    8585                $(TARGET_CONFIGURE_OPTS) \ 
    8686                LD="$(TARGET_CC)" \ 

  • trunk/package/gdb/Makefile

    r33479 r33523  
    6060 
    6161define Build/Compile 
    62         $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ 
     62        +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ 
    6363                DESTDIR="$(PKG_INSTALL_DIR)" \ 
    6464                CPPFLAGS="$(TARGET_CPPFLAGS)" \ 

  • trunk/package/hostapd/Makefile

    r33456 r33523  
    235235define Build/RunMake 
    236236        CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ 
    237         $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(1) \ 
     237        +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(1) \ 
    238238                $(TARGET_CONFIGURE_OPTS) \ 
    239239                $(DRIVER_MAKEOPTS) \ 

  • trunk/package/iproute2/Makefile

    r32103 r33523  
    7676 
    7777define Build/Compile 
    78         $(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS)  
     78        +$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) 
    7979endef 
    8080 

  • trunk/package/linux-atm/Makefile

    r33418 r33523  
    8080define Build/Compile 
    8181        # src/qgen is built with HOSTCC, which does not really like our LDFLAGS 
    82         $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src/qgen \ 
     82        +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src/qgen \ 
    8383                LDFLAGS="" \ 
    8484                all 
    85         $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) OBJCOPY=$(TARGET_CROSS)objcopy all 
     85        +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) OBJCOPY=$(TARGET_CROSS)objcopy all 
    8686endef 
    8787 

  • trunk/package/mac80211/Makefile

    r33465 r33523  
    13421342 define Build/Compile/kmod 
    13431343        rm -rf $(PKG_BUILD_DIR)/modules 
    1344         $(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" $(MAKE_OPTS) modules 
     1344        +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" $(MAKE_OPTS) modules 
    13451345 endef 
    13461346endif 

  • trunk/package/opkg/Makefile

    r33424 r33523  
    8989 
    9090define Host/Compile 
    91         $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) CC="$(HOSTCC)" all 
     91        +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) CC="$(HOSTCC)" all 
    9292endef 
    9393 

  • trunk/package/pjsip/Makefile

    r33160 r33523  
    8787 
    8888define Build/Compile 
    89         CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ 
     89        +CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ 
    9090        CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ 
    9191        LDFLAGS="$(TARGET_LDFLAGS) -lc $(LIBGCC_S) -lm" \ 

  • trunk/package/zlib/Makefile

    r32147 r33523  
    3838 
    3939define Build/Compile 
    40         $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ 
     40        +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ 
    4141                $(TARGET_CONFIGURE_OPTS) \ 
    4242                CFLAGS="$(TARGET_CFLAGS)" \ 

  • trunk/toolchain/binutils/Makefile

    r33443 r33523  
    7878 
    7979define Host/Compile 
    80         $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) all 
     80        +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) all 
    8181endef 
    8282 

  • trunk/toolchain/gcc/final/Makefile

    r33444 r33523  
    4848 
    4949define Host/Compile 
    50         $(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) all 
     50        +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) all 
    5151endef 
    5252 

  • trunk/toolchain/gcc/initial/Makefile

    r33444 r33523  
    1212define Host/Compile 
    1313        $(CP) $(BUILD_DIR_TOOLCHAIN)/linux-dev/* $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/ 
    14         $(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \ 
     14        +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \ 
    1515                all-build-libiberty \ 
    1616                all-gcc \ 

  • trunk/toolchain/gcc/minimal/Makefile

    r33444 r33523  
    3131 
    3232define Host/Compile 
    33         $(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) all-gcc all-target-libgcc 
     33        +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) all-gcc all-target-libgcc 
    3434endef 
    3535 

  • trunk/tools/cmake/Makefile

    r33441 r33523  
    1515 
    1616HOST_BUILD_PARALLEL:=1 
     17HOST_CONFIGURE_PARALLEL:=1 
    1718 
    1819include $(INCLUDE_DIR)/host-build.mk 

  • trunk/tools/libelf/Makefile

    r33437 r33523  
    3333 
    3434define Host/Compile 
    35         $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR)/lib/ libelf.a 
     35        +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR)/lib/ libelf.a 
    3636endef 
    3737 

  • trunk/tools/sed/Makefile

    r33428 r33523  
    3030 
    3131define Host/Compile 
    32         $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) SHELL="$(BASH)" LDFLAGS="$(HOST_STATIC_LINKING)" 
     32        +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) SHELL="$(BASH)" LDFLAGS="$(HOST_STATIC_LINKING)" 
    3333endef 
    3434 

  • trunk/tools/xz/Makefile

    r33431 r33523  
    2121 
    2222define Host/Install 
    23         $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) install xzlinks="unxz xzcat" \ 
     23        +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) install xzlinks="unxz xzcat" \ 
    2424                AM_LDFLAGS="$(if $(HOST_STATIC_LINKING),-all-static)" 
    2525endef 
Note: See TracChangeset for help on using the changeset viewer.