From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 23 Sep 2012 09:58:24 +0000 (+0000)
Subject: packages: fix parallel build by adding + for every make command that passes the jobserver
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=267d513463cd64899a24bed5b4b1e27f82da684e

packages: fix parallel build by adding + for every make command that passes the jobserver

SVN-Revision: 33524
---

diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index eb99070b17..fc07eda706 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -91,7 +91,7 @@ define Build/InstallDev
 endef
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/bfd/doc/ CFLAGS="-I$(PKG_BUILD_DIR)/include" chew
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/bfd/doc/ CFLAGS="-I$(PKG_BUILD_DIR)/include" chew
 	$(call Build/Compile/Default)
 endef
 
diff --git a/ipv6/mrd6/Makefile b/ipv6/mrd6/Makefile
index dc99a2100b..b62caa443e 100644
--- a/ipv6/mrd6/Makefile
+++ b/ipv6/mrd6/Makefile
@@ -49,7 +49,7 @@ MRD6_MAKEFLAGS:= \
 	PREFIX="/usr"
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src $(MRD6_MAKEFLAGS) all
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src $(MRD6_MAKEFLAGS) all
 endef
 
 define Build/Install
diff --git a/lang/python-sip/Makefile b/lang/python-sip/Makefile
index 01d1b0d7ff..cd84aa8a53 100644
--- a/lang/python-sip/Makefile
+++ b/lang/python-sip/Makefile
@@ -75,7 +75,7 @@ define Build/Configure
 endef
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CROSS)gcc" \
 		CXX="$(TARGET_CROSS)g++" \
 		LINK="$(TARGET_CROSS)g++" \
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 6cc1d2998e..59ab10ec5d 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -463,9 +463,9 @@ define Host/Configure
 endef
 
 define Host/Compile
-	$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
+	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
 		python Parser/pgen
-	$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
+	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
 		HOSTPYTHON=$(HOST_BUILD_DIR)/python \
 		sharedmods
 endef
diff --git a/libs/boost/Makefile b/libs/boost/Makefile
index 226558e2c5..211816781e 100644
--- a/libs/boost/Makefile
+++ b/libs/boost/Makefile
@@ -190,7 +190,7 @@ define Build/Compile
 			echo "using python : : $(STAGING_DIR_ROOT)/usr/bin/python :	$(STAGING_DIR)/usr/include/python2.7/ ;" >> \
 				tools/build/v2/user-config.jam; \
 		) \
-		bjam \
+		+bjam \
 			'-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \
 			$(filter -j%,$(PKG_JOBS)) \
 			--toolset=gcc-$(ARCH) --build-type=minimal --layout=system \
diff --git a/libs/curl/Makefile b/libs/curl/Makefile
index 6152eeea17..e2af01bfe8 100644
--- a/libs/curl/Makefile
+++ b/libs/curl/Makefile
@@ -85,7 +85,7 @@ CONFIGURE_VARS += \
 	CC="$(filter-out ccache,$(TARGET_CC))"
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		CC="$(TARGET_CC)" \
 		install
diff --git a/libs/db47/Makefile b/libs/db47/Makefile
index d74f56284c..4eda902e05 100644
--- a/libs/db47/Makefile
+++ b/libs/db47/Makefile
@@ -77,7 +77,7 @@ endef
 TARGET_CFLAGS += $(FPIC)
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/build_unix \
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/build_unix \
 		DESTDIR="$(PKG_INSTALL_DIR)" all
 	$(MAKE) -C $(PKG_BUILD_DIR)/build_unix \
 		DESTDIR="$(PKG_INSTALL_DIR)" install
diff --git a/libs/expat/Makefile b/libs/expat/Makefile
index 3e2d9a60c3..14d254b678 100644
--- a/libs/expat/Makefile
+++ b/libs/expat/Makefile
@@ -42,7 +42,7 @@ CONFIGURE_ARGS += \
 	--enable-static
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
 endef
 
 define Host/Install
diff --git a/libs/gdbm/Makefile b/libs/gdbm/Makefile
index 9dd6d66f0c..b992daed18 100644
--- a/libs/gdbm/Makefile
+++ b/libs/gdbm/Makefile
@@ -34,7 +34,7 @@ CONFIGURE_ARGS += \
 	--enable-static \
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		BINOWN=`id -u` \
 		BINGRP=`id -g` \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
diff --git a/libs/jpeg/Makefile b/libs/jpeg/Makefile
index 14b27981e9..62c8c86326 100644
--- a/libs/jpeg/Makefile
+++ b/libs/jpeg/Makefile
@@ -63,7 +63,7 @@ endef
 
 define Build/Compile
 	$(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/{include,lib,bin,man/man1}
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		LIBTOOL="./libtool --tag=CC" \
 		prefix="$(PKG_INSTALL_DIR)/usr" \
 		exec_prefix="$(PKG_INSTALL_DIR)/usr" \
diff --git a/libs/matrixssl/Makefile b/libs/matrixssl/Makefile
index b3ae076360..6580b8ceb5 100644
--- a/libs/matrixssl/Makefile
+++ b/libs/matrixssl/Makefile
@@ -36,7 +36,7 @@ endef
 TARGET_CFLAGS += $(FPIC)
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src \
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src \
 		$(TARGET_CONFIGURE_OPTS) \
 		DFLAGS="$(TARGET_CFLAGS) -Wall"
 endef
diff --git a/libs/mysql/Makefile b/libs/mysql/Makefile
index 0f18db30e2..06c2bafa5c 100644
--- a/libs/mysql/Makefile
+++ b/libs/mysql/Makefile
@@ -112,7 +112,7 @@ endef
 TARGET_CFLAGS += $(FPIC)
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
+	+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
 		SUBDIRS="include" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all
@@ -120,13 +120,13 @@ define Build/Compile
 		SUBDIRS="include" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		install
-	$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)/libmysql" \
+	+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)/libmysql" \
 		CC="g++" \
 		CFLAGS="$(HOST_CFLAGS)" \
 		CPPFLAGS="$(HOST_CFLAGS)" \
 		LDFLAGS="$(HOST_LDFLAGS)" \
 		conf_to_src
-	$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
+	+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
 		SUBDIRS="libmysql" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all
@@ -134,7 +134,7 @@ define Build/Compile
 		SUBDIRS="libmysql" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		install
-	$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
+	+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
 		SUBDIRS="libmysql_r" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all
@@ -147,7 +147,7 @@ define Build/Compile
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		bin_SCRIPTS="mysql_config" \
 		install
-	$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
+	+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all
 	$(MAKE) -C "$(PKG_BUILD_DIR)" \
diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile
index e57259cd2d..74d2ceb7a9 100644
--- a/libs/postgresql/Makefile
+++ b/libs/postgresql/Makefile
@@ -160,10 +160,10 @@ TARGET_CFLAGS += $(FPIC)
 unexport PROFILE
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
+	+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all
-	$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
+	+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		install
 endef
diff --git a/multimedia/crtmpserver/Makefile b/multimedia/crtmpserver/Makefile
index f3efb0e0d2..0f3e27eb97 100644
--- a/multimedia/crtmpserver/Makefile
+++ b/multimedia/crtmpserver/Makefile
@@ -61,7 +61,7 @@ define Build/Configure
 endef
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/builders/make \
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/builders/make \
 		PLATFORM=linux-openwrt-uclibc
 endef
 
diff --git a/net/lispmob/Makefile b/net/lispmob/Makefile
index 7e09a8520d..36399bace3 100644
--- a/net/lispmob/Makefile
+++ b/net/lispmob/Makefile
@@ -90,7 +90,7 @@ endif
 
 ifdef CONFIG_PACKAGE_lispd
   define Build/Compile/lispd
-	$(MAKE_VARS) \
+	+$(MAKE_VARS) \
 	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/lispd \
 		$(MAKE_FLAGS)
   endef
@@ -98,7 +98,7 @@ endif
 
 ifdef CONFIG_PACKAGE_lispconf
   define Build/Compile/lispconf
-	$(MAKE_VARS) \
+	+$(MAKE_VARS) \
 	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/lispconf \
 		$(MAKE_FLAGS)
   endef
diff --git a/net/openswan/Makefile b/net/openswan/Makefile
index 3bf0aa8394..78c45898ab 100644
--- a/net/openswan/Makefile
+++ b/net/openswan/Makefile
@@ -74,8 +74,8 @@ OPENSWAN_MAKEFLAGS:= \
 	DESTDIR="$(PKG_INSTALL_DIR)"
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) $(OPENSWAN_MAKEFLAGS) programs
-	$(MAKE) $(PKG_JOBS) $(OPENSWAN_MAKEFLAGS) module
+	+$(MAKE) $(PKG_JOBS) $(OPENSWAN_MAKEFLAGS) programs
+	+$(MAKE) $(PKG_JOBS) $(OPENSWAN_MAKEFLAGS) module
 endef
 
 define Build/Install
diff --git a/net/peerguardian/Makefile b/net/peerguardian/Makefile
index a910db1e7f..4c5c0a2b34 100644
--- a/net/peerguardian/Makefile
+++ b/net/peerguardian/Makefile
@@ -47,7 +47,7 @@ CONFIGURE_VARS+= \
 	LIBS="-lm"
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		CXXLD="$(TARGET_CXX)"
 endef
 
diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile
index a3c07c7795..577a314cfd 100644
--- a/net/vnstat/Makefile
+++ b/net/vnstat/Makefile
@@ -60,13 +60,13 @@ define Package/vnstat/conffiles
 endef
 
 define Build/Compile/vnstat
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)"
 endef
 
 define Build/Compile/vnstati
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
 		LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib" \
diff --git a/net/xtables-addons/Makefile b/net/xtables-addons/Makefile
index fb385784f9..8e04e27c13 100644
--- a/net/xtables-addons/Makefile
+++ b/net/xtables-addons/Makefile
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+= \
 	--with-xtlibdir="/usr/lib/iptables" \
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		ARCH="$(LINUX_KARCH)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
diff --git a/net/znc/Makefile b/net/znc/Makefile
index b9c63ed77d..8a2bfa052e 100644
--- a/net/znc/Makefile
+++ b/net/znc/Makefile
@@ -284,7 +284,7 @@ endef
 
 define Build/Compile
 	$(call Build/Compile/Default,znc)
-	$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/modules \
+	+$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/modules \
 		$(MAKE_FLAGS) $(ZNC_MODULE_TARGETS)
 endef
 
diff --git a/utils/bemused/Makefile b/utils/bemused/Makefile
index 4cd0b13a37..61cc1013a6 100644
--- a/utils/bemused/Makefile
+++ b/utils/bemused/Makefile
@@ -40,7 +40,7 @@ EXTRA_CPPFLAGS:= \
 	-I$(STAGING_DIR)/usr/lib/glib/include
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
 		CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
diff --git a/utils/lm-sensors/Makefile b/utils/lm-sensors/Makefile
index cfee110035..b9039d5538 100644
--- a/utils/lm-sensors/Makefile
+++ b/utils/lm-sensors/Makefile
@@ -65,7 +65,7 @@ define Package/lm-sensors/conffiles
 endef
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		KERNELVERSION="$(LINUX_VERSION)" \
 		LINUX="$(LINUX_DIR)" \
diff --git a/utils/loop-aes/Makefile b/utils/loop-aes/Makefile
index a436400560..5e236013c5 100644
--- a/utils/loop-aes/Makefile
+++ b/utils/loop-aes/Makefile
@@ -37,7 +37,7 @@ define KernelPackage/loop-aes/description
 endef
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		ARCH="$(LINUX_KARCH)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		CC="$(TARGET_CC)" \
diff --git a/utils/vim/Makefile b/utils/vim/Makefile
index 743f94f7d0..0f7a687f42 100644
--- a/utils/vim/Makefile
+++ b/utils/vim/Makefile
@@ -117,7 +117,7 @@ define Build/Compile/vim
 		--disable-multibyte \
 	)
 	$(MAKE) -C $(PKG_BUILD_DIR) clean
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" all
 	$(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_tiny
 endef
@@ -130,7 +130,7 @@ define Build/Compile/vim-full
 		--enable-multibyte \
 	)
 	$(MAKE) -C $(PKG_BUILD_DIR) clean
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" all
 	$(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_normal
 endef
@@ -138,7 +138,7 @@ endif
 
 ifneq ($(CONFIG_PACKAGE_xxd),)
 define Build/Compile/xxd
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" all
 endef
 endif