Skip to content

Commit

Permalink
build: add the + token to any commands that can pass through the jobs…
Browse files Browse the repository at this point in the history 
…erver, fixes parallel build on some systems

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33523 3c298f89-4303-0410-b956-a3cf2f4a3e73
  • Loading branch information
nbd committed Sep 23, 2012
1 parent f3bfb88 commit 6a31a70
Show file tree
Hide file tree
Showing 20 changed files with 23 additions and 22 deletions.
4 changes: 2 additions & 2 deletions include/host-build.mk
View file
Expand Up @@ -80,7 +80,7 @@ ifneq ($(HOST_OS),Darwin)
endif

define Host/Configure/Default
(cd $(HOST_BUILD_DIR)/$(3); \
$(if $(HOST_CONFIGURE_PARALLEL),+)(cd $(HOST_BUILD_DIR)/$(3); \
if [ -x configure ]; then \
$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/$(3)/ && \
$(2) \
Expand All @@ -97,7 +97,7 @@ define Host/Configure
endef

define Host/Compile/Default
$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
$(HOST_MAKE_FLAGS) \
$(1)
endef
Expand Down
2 changes: 1 addition & 1 deletion include/package-defaults.mk
View file
Expand Up @@ -129,7 +129,7 @@ MAKE_INSTALL_FLAGS = \
MAKE_PATH = .

define Build/Compile/Default
$(MAKE_VARS) \
+$(MAKE_VARS) \
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
$(MAKE_FLAGS) \
$(1);
Expand Down
2 changes: 1 addition & 1 deletion package/busybox/Makefile
View file
Expand Up @@ -80,7 +80,7 @@ ifdef CONFIG_BUSYBOX_CONFIG_FEATURE_HAVE_RPC
endif

define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
KBUILD_HAVE_NLS=no \
Expand Down
4 changes: 2 additions & 2 deletions package/dropbear/Makefile
View file
Expand Up @@ -76,12 +76,12 @@ define Build/Configure
endef

define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
LD="$(TARGET_CC)" \
PROGRAMS="dropbear dbclient dropbearkey scp" \
MULTI=1 SCPPROGRESS=1
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
LD="$(TARGET_CC)" \
PROGRAMS="dropbearconvert"
Expand Down
2 changes: 1 addition & 1 deletion package/gdb/Makefile
View file
Expand Up @@ -59,7 +59,7 @@ CONFIGURE_VARS+= \
ac_cv_search_tgetent="$(TARGET_LDFLAGS) -lncurses -lreadline"

define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
CPPFLAGS="$(TARGET_CPPFLAGS)" \
all
Expand Down
2 changes: 1 addition & 1 deletion package/hostapd/Makefile
View file
Expand Up @@ -234,7 +234,7 @@ endif

define Build/RunMake
CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(1) \
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(1) \
$(TARGET_CONFIGURE_OPTS) \
$(DRIVER_MAKEOPTS) \
LIBS="$(TARGET_LDFLAGS)" \
Expand Down
2 changes: 1 addition & 1 deletion package/iproute2/Makefile
View file
Expand Up @@ -75,7 +75,7 @@ MAKE_FLAGS += \
FPIC="$(FPIC)"

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

define Build/InstallDev
Expand Down
4 changes: 2 additions & 2 deletions package/linux-atm/Makefile
View file
Expand Up @@ -79,10 +79,10 @@ unexport PREFIX

define Build/Compile
# 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="" \
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

define Build/InstallDev
Expand Down
2 changes: 1 addition & 1 deletion package/mac80211/Makefile
View file
Expand Up @@ -1341,7 +1341,7 @@ endef
ifneq ($(CONFIG_PACKAGE_kmod-cfg80211)$(CONFIG_PACKAGE_kmod-lib80211),)
define Build/Compile/kmod
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
endif

Expand Down
2 changes: 1 addition & 1 deletion package/opkg/Makefile
View file
Expand Up @@ -88,7 +88,7 @@ HOST_CONFIGURE_ARGS+= \
--with-opkglockfile=/tmp/opkg.lock

define Host/Compile
$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) CC="$(HOSTCC)" all
+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) CC="$(HOSTCC)" all
endef

define Host/Install
Expand Down
2 changes: 1 addition & 1 deletion package/pjsip/Makefile
View file
Expand Up @@ -86,7 +86,7 @@ define Build/Configure
endef

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)" \
LDFLAGS="$(TARGET_LDFLAGS) -lc $(LIBGCC_S) -lm" \
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH)
Expand Down
2 changes: 1 addition & 1 deletion package/zlib/Makefile
View file
Expand Up @@ -37,7 +37,7 @@ define Build/Configure
endef

define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
libz.a libz.so.$(PKG_VERSION)
Expand Down
2 changes: 1 addition & 1 deletion toolchain/binutils/Makefile
View file
Expand Up @@ -77,7 +77,7 @@ define Host/Configure
endef

define Host/Compile
$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) all
+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) all
endef

define Host/Install
Expand Down
2 changes: 1 addition & 1 deletion toolchain/gcc/final/Makefile
View file
Expand Up @@ -47,7 +47,7 @@ define Host/Configure
endef

define Host/Compile
$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) all
+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) all
endef

define SetupExtraArch
Expand Down
2 changes: 1 addition & 1 deletion toolchain/gcc/initial/Makefile
View file
Expand Up @@ -11,7 +11,7 @@ GCC_CONFIGURE += \

define Host/Compile
$(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-gcc \
$(if $(GCC_BUILD_TARGET_LIBGCC),all-target-libgcc)
Expand Down
2 changes: 1 addition & 1 deletion toolchain/gcc/minimal/Makefile
View file
Expand Up @@ -30,7 +30,7 @@ define Host/Prepare
endef

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

define Host/Install
Expand Down
1 change: 1 addition & 0 deletions tools/cmake/Makefile
View file
Expand Up @@ -14,6 +14,7 @@ PKG_SOURCE_URL:=http://www.cmake.org/files/v2.8/
PKG_MD5SUM:=e1b237aeaed880f65dec9c20602452f6

HOST_BUILD_PARALLEL:=1
HOST_CONFIGURE_PARALLEL:=1

include $(INCLUDE_DIR)/host-build.mk

Expand Down
2 changes: 1 addition & 1 deletion tools/libelf/Makefile
View file
Expand Up @@ -32,7 +32,7 @@ endef


define Host/Compile
$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR)/lib/ libelf.a
+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR)/lib/ libelf.a
endef

define Host/Install
Expand Down
2 changes: 1 addition & 1 deletion tools/sed/Makefile
View file
Expand Up @@ -29,7 +29,7 @@ HOST_CONFIGURE_VARS += \
ac_cv_header_selinux_selinux_h=no \

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

define Host/Install
Expand Down
2 changes: 1 addition & 1 deletion tools/xz/Makefile
View file
Expand Up @@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/host-build.mk
HOST_LDFLAGS += $(HOST_STATIC_LINKING)

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)"
endef

Expand Down

0 comments on commit 6a31a70

Please sign in to comment.