mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

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

Browse Source 
SVN-Revision: 33523
This commit is contained in:
Felix Fietkau 2012-09-23 09:50:01 +00:00
parent 5c88d907c8
commit ed2bf29be5
20 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/host-build.mk
View File

@ -80,7 +80,7 @@ ifneq ($(HOST_OS),Darwin)
endif endif
define Host/Configure/Default define Host/Configure/Default
(cd $(HOST_BUILD_DIR)/$(3); \ $(if $(HOST_CONFIGURE_PARALLEL),+)(cd $(HOST_BUILD_DIR)/$(3); \
if [ -x configure ]; then \ if [ -x configure ]; then \
$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/$(3)/ && \ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/$(3)/ && \
$(2) \ $(2) \
@ -97,7 +97,7 @@ define Host/Configure
endef endef
define Host/Compile/Default define Host/Compile/Default
$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \ +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
$(HOST_MAKE_FLAGS) \ $(HOST_MAKE_FLAGS) \
$(1) $(1)
endef endef

2
include/package-defaults.mk
View File

@ -129,7 +129,7 @@ MAKE_INSTALL_FLAGS = \
MAKE_PATH = . MAKE_PATH = .
define Build/Compile/Default define Build/Compile/Default
$(MAKE_VARS) \ +$(MAKE_VARS) \
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
$(MAKE_FLAGS) \ $(MAKE_FLAGS) \
$(1); $(1);

2
package/busybox/Makefile
View File

@ -80,7 +80,7 @@ ifdef CONFIG_BUSYBOX_CONFIG_FEATURE_HAVE_RPC
endif endif
define Build/Compile define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \
KBUILD_HAVE_NLS=no \ KBUILD_HAVE_NLS=no \

4
package/dropbear/Makefile
View File

@ -76,12 +76,12 @@ define Build/Configure
endef endef
define Build/Compile define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
LD="$(TARGET_CC)" \ LD="$(TARGET_CC)" \
PROGRAMS="dropbear dbclient dropbearkey scp" \ PROGRAMS="dropbear dbclient dropbearkey scp" \
MULTI=1 SCPPROGRESS=1 MULTI=1 SCPPROGRESS=1
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
LD="$(TARGET_CC)" \ LD="$(TARGET_CC)" \
PROGRAMS="dropbearconvert" PROGRAMS="dropbearconvert"

2
package/gdb/Makefile
View File

@ -59,7 +59,7 @@ CONFIGURE_VARS+= \
ac_cv_search_tgetent="$(TARGET_LDFLAGS) -lncurses -lreadline" ac_cv_search_tgetent="$(TARGET_LDFLAGS) -lncurses -lreadline"
define Build/Compile define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
CPPFLAGS="$(TARGET_CPPFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS)" \
all all

2
package/hostapd/Makefile
View File

@ -234,7 +234,7 @@ endif
define Build/RunMake define Build/RunMake
CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(1) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(1) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
$(DRIVER_MAKEOPTS) \ $(DRIVER_MAKEOPTS) \
LIBS="$(TARGET_LDFLAGS)" \ LIBS="$(TARGET_LDFLAGS)" \

2
package/iproute2/Makefile
View File

@ -75,7 +75,7 @@ MAKE_FLAGS += \
FPIC="$(FPIC)" FPIC="$(FPIC)"
define Build/Compile define Build/Compile
$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) +$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS)
endef endef
define Build/InstallDev define Build/InstallDev

4
package/linux-atm/Makefile
View File

@ -79,10 +79,10 @@ unexport PREFIX
define Build/Compile define Build/Compile
# src/qgen is built with HOSTCC, which does not really like our LDFLAGS # src/qgen is built with HOSTCC, which does not really like our LDFLAGS
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src/qgen \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src/qgen \
LDFLAGS="" \ LDFLAGS="" \
all all
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) OBJCOPY=$(TARGET_CROSS)objcopy all +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) OBJCOPY=$(TARGET_CROSS)objcopy all
endef endef
define Build/InstallDev define Build/InstallDev

2
package/mac80211/Makefile
View File

@ -1341,7 +1341,7 @@ endef
ifneq ($(CONFIG_PACKAGE_kmod-cfg80211)$(CONFIG_PACKAGE_kmod-lib80211),) ifneq ($(CONFIG_PACKAGE_kmod-cfg80211)$(CONFIG_PACKAGE_kmod-lib80211),)
define Build/Compile/kmod define Build/Compile/kmod
rm -rf $(PKG_BUILD_DIR)/modules rm -rf $(PKG_BUILD_DIR)/modules
$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" $(MAKE_OPTS) modules +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" $(MAKE_OPTS) modules
endef endef
endif endif

2
package/opkg/Makefile
View File

@ -88,7 +88,7 @@ HOST_CONFIGURE_ARGS+= \
--with-opkglockfile=/tmp/opkg.lock --with-opkglockfile=/tmp/opkg.lock
define Host/Compile define Host/Compile
$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) CC="$(HOSTCC)" all +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) CC="$(HOSTCC)" all
endef endef
define Host/Install define Host/Install

2
package/pjsip/Makefile
View File

@ -86,7 +86,7 @@ define Build/Configure
endef endef
define Build/Compile define Build/Compile
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ +CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS) -lc $(LIBGCC_S) -lm" \ LDFLAGS="$(TARGET_LDFLAGS) -lc $(LIBGCC_S) -lm" \
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH)

2
package/zlib/Makefile
View File

@ -37,7 +37,7 @@ define Build/Configure
endef endef
define Build/Compile define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
libz.a libz.so.$(PKG_VERSION) libz.a libz.so.$(PKG_VERSION)

2
toolchain/binutils/Makefile
View File

@ -77,7 +77,7 @@ define Host/Configure
endef endef
define Host/Compile define Host/Compile
$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) all +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) all
endef endef
define Host/Install define Host/Install

2
toolchain/gcc/final/Makefile
View File

@ -47,7 +47,7 @@ define Host/Configure
endef endef
define Host/Compile define Host/Compile
$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) all +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) all
endef endef
define SetupExtraArch define SetupExtraArch

2
toolchain/gcc/initial/Makefile
View File

@ -11,7 +11,7 @@ GCC_CONFIGURE += \
define Host/Compile define Host/Compile
$(CP) $(BUILD_DIR_TOOLCHAIN)/linux-dev/* $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/ $(CP) $(BUILD_DIR_TOOLCHAIN)/linux-dev/* $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/
$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \ +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \
all-build-libiberty \ all-build-libiberty \
all-gcc \ all-gcc \
$(if $(GCC_BUILD_TARGET_LIBGCC),all-target-libgcc) $(if $(GCC_BUILD_TARGET_LIBGCC),all-target-libgcc)

2
toolchain/gcc/minimal/Makefile
View File

@ -30,7 +30,7 @@ define Host/Prepare
endef endef
define Host/Compile define Host/Compile
$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) all-gcc all-target-libgcc +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) all-gcc all-target-libgcc
endef endef
define Host/Install define Host/Install

1
tools/cmake/Makefile
View File

@ -14,6 +14,7 @@ PKG_SOURCE_URL:=http://www.cmake.org/files/v2.8/
PKG_MD5SUM:=e1b237aeaed880f65dec9c20602452f6 PKG_MD5SUM:=e1b237aeaed880f65dec9c20602452f6
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1
HOST_CONFIGURE_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk

2
tools/libelf/Makefile
View File

@ -32,7 +32,7 @@ endef
define Host/Compile define Host/Compile
$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR)/lib/ libelf.a +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR)/lib/ libelf.a
endef endef
define Host/Install define Host/Install

2
tools/sed/Makefile
View File

@ -29,7 +29,7 @@ HOST_CONFIGURE_VARS += \
ac_cv_header_selinux_selinux_h=no \ ac_cv_header_selinux_selinux_h=no \
define Host/Compile define Host/Compile
$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) SHELL="$(BASH)" LDFLAGS="$(HOST_STATIC_LINKING)" +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) SHELL="$(BASH)" LDFLAGS="$(HOST_STATIC_LINKING)"
endef endef
define Host/Install define Host/Install

2
tools/xz/Makefile
View File

@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/host-build.mk
HOST_LDFLAGS += $(HOST_STATIC_LINKING) HOST_LDFLAGS += $(HOST_STATIC_LINKING)
define Host/Install define Host/Install
$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) install xzlinks="unxz xzcat" \ +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) install xzlinks="unxz xzcat" \
AM_LDFLAGS="$(if $(HOST_STATIC_LINKING),-all-static)" AM_LDFLAGS="$(if $(HOST_STATIC_LINKING),-all-static)"
endef endef