packages: fix parallel build by adding + for every make command that passes the jobserver
authorFelix Fietkau <nbd@openwrt.org>
Sun, 23 Sep 2012 09:58:24 +0000 (09:58 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sun, 23 Sep 2012 09:58:24 +0000 (09:58 +0000)
SVN-Revision: 33524

24 files changed:
devel/binutils/Makefile
ipv6/mrd6/Makefile
lang/python-sip/Makefile
lang/python/Makefile
libs/boost/Makefile
libs/curl/Makefile
libs/db47/Makefile
libs/expat/Makefile
libs/gdbm/Makefile
libs/jpeg/Makefile
libs/matrixssl/Makefile
libs/mysql/Makefile
libs/postgresql/Makefile
multimedia/crtmpserver/Makefile
net/lispmob/Makefile
net/openswan/Makefile
net/peerguardian/Makefile
net/vnstat/Makefile
net/xtables-addons/Makefile
net/znc/Makefile
utils/bemused/Makefile
utils/lm-sensors/Makefile
utils/loop-aes/Makefile
utils/vim/Makefile

index eb99070b1782694298278e822eb4964fab876c8e..fc07eda7067689349bb393de9bbae06b08aaea92 100644 (file)
@@ -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
 
index dc99a2100b68c9655e84f668579f5d452e25657c..b62caa443e346c7c2a2d666feef08311494eb406 100644 (file)
@@ -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
index 01d1b0d7ffc237d6c2dc582b71e19e0a9256854e..cd84aa8a537fb3d2a908642823c8a97ddd3b0724 100644 (file)
@@ -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++" \
index 6cc1d2998ec791e721943214407ffd821df08a1a..59ab10ec5d5917dee82729b00ade379bbe80d4e9 100644 (file)
@@ -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
index 226558e2c517074ddcdeee4eb722ae13ceb90c5c..211816781eec3b7ac5b8f928b6a14b76b9ce27dd 100644 (file)
@@ -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 \
index 6152eeea17f99e21a18baed524a238491a6de504..e2af01bfe80b6f5a73f531018c8aadf5c44a17be 100644 (file)
@@ -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
index d74f56284ca04e8cb1ab50f72ce1cdc33253f7b8..4eda902e05087ee707ee94bcb6417500560702cc 100644 (file)
@@ -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
index 3e2d9a60c3eb8f64f04ec29495bcb3e5776f25d5..14d254b678080611a9b89e997f106487ff7195d9 100644 (file)
@@ -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
index 9dd6d66f0cdfa41a1fe010961808795b224e2d83..b992daed18392aa2d797fef5d9662ebb9fcc75b8 100644 (file)
@@ -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)" \
index 14b27981e995de7f6318b691f9809d0d2f54aa55..62c8c86326e264f3e6e2be99006c7d2a11e18457 100644 (file)
@@ -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" \
index b3ae0763603ffd6d21ec286330a68bbe5e5b406a..6580b8ceb56fd6fa246ca362bec46e6258e94a81 100644 (file)
@@ -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
index 0f18db30e20e971e85cde6bcd96e5d164dedf123..06c2bafa5c4de8fa330423d9c4cf7dee4d70330b 100644 (file)
@@ -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)" \
index e57259cd2d16bd928d68ea6d694b8cf42ad8df4e..74d2ceb7a99bb78d7a5557d7f6eff2a1117da57e 100644 (file)
@@ -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
index f3efb0e0d2b01a71dd514a2c5d69688c0919ed40..0f3e27eb975eb5e23e371e04dc55f6511cb6c0cb 100644 (file)
@@ -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
 
index 7e09a8520d2ab45e7df7edcced2d0df96a6fbab9..36399bace3adb8e66789dd2bf69090dbd230952a 100644 (file)
@@ -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
index 3bf0aa8394b2d2fc32aee8db11221827b032d910..78c45898ab5f2e20e221f6c1553405bd7146d047 100644 (file)
@@ -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
index a910db1e7f2d013ec97a814f07a00a973dd914f9..4c5c0a2b341601abedfcffaf1dcef73c8f8894dd 100644 (file)
@@ -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
 
index a3c07c77954b0ab99f7d3b09b61429d5fc49de37..577a314cfd416373cf0147f55c0ea432a4debcf2 100644 (file)
@@ -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" \
index fb385784f955213bb4d31e460ae2c6a387b046b5..8e04e27c137fad16f84b72e5243a0b26000d4a35 100644 (file)
@@ -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)" \
index b9c63ed77d1cf9735bfefdefcd60ab2a92f514f4..8a2bfa052e082bb5ff7f937b9b2d04c27bec3fd8 100644 (file)
@@ -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
 
index 4cd0b13a3733fe76c6a7ba270318a9b4db3a17ba..61cc1013a6bd77f8de771edbeb6b73061c589824 100644 (file)
@@ -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)" \
index cfee11003599d5b339f002f6ceb66875e41e307a..b9039d5538806e86364bb5c79e7c132133c1ff76 100644 (file)
@@ -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)" \
index a4364005600ede05f98f8b7b7de33aac0efd37ec..5e236013c5cdb7bdbabae7848820583b6846c23b 100644 (file)
@@ -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)" \
index 743f94f7d0d5dc4ec2e97104be1a19bde9eb2c28..0f7a687f429b5ac65f93cfe6ed62599788f95332 100644 (file)
@@ -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