From: Joseph Roback <openwrt-devel@roback.cc>

26 Makefile patches for enabling parallel builds. Tested on Linux (8-core) and Darwin (12-core), individually and from clean build_root. The first set is from trunk, the second is from feeds/packages.

Signed-off-by: Joe Roback <joe@roback.cc>
SVN-Revision: 22967

diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile
index 3ca330dbd30fc5b9a29c170f719f9eda64560cba..5b798660c782f5d9cd40b357f411cd5c075e2a45 100644 (file)
--- a/libs/avahi/Makefile
+++ b/libs/avahi/Makefile
@@ -19,6 +19,7 @@ PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -195,4 +196,3 @@ $(eval $(call BuildPackage,libavahi))
 $(eval $(call BuildPackage,avahi-autoipd))
 $(eval $(call BuildPackage,avahi-daemon))
 $(eval $(call BuildPackage,avahi-dnsconfd))
-

diff --git a/libs/curl/Makefile b/libs/curl/Makefile
index 411ee0599c025ac50926a7185eaba54beb0e6a50..b424c052ae5e6e3d39bdb37a95857d962f11fd52 100644 (file)
--- a/libs/curl/Makefile
+++ b/libs/curl/Makefile
@@ -21,7 +21,8 @@ PKG_SOURCE_URL:=http://curl.haxx.se/download/ \
        http://curl.mirrors.cyberservers.net/download/
 PKG_MD5SUM:=8402c1f654c51ad7287aad57c3aa79be
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -86,7 +87,7 @@ define Build/Configure
 endef
 
 define Build/Compile
-       $(MAKE) -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 6fe56a3fa43ebb5837a70691a2ec7d1c5c26943d..7e62dcadd56f66d671fc301d3053a402555264e4 100644 (file)
--- a/libs/db47/Makefile
+++ b/libs/db47/Makefile
@@ -18,6 +18,7 @@ PKG_MD5SUM:=073ab7f20d24b3872a51ca762f5090e7
 
 PKG_FIXUP:=libtool
 PKG_LIBTOOL_PATHS:=. build_unix
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -76,6 +77,8 @@ endef
 TARGET_CFLAGS += $(FPIC)
 
 define Build/Compile
+       $(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
 endef

diff --git a/libs/expat/Makefile b/libs/expat/Makefile
index 80b0d26bc6bb2ae1e2fa413d3c4c616f20f48648..c00dce393a2e2fbd5fb7f8449f3ac34fd1d4bb67 100644 (file)
--- a/libs/expat/Makefile
+++ b/libs/expat/Makefile
@@ -15,7 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MD5SUM:=ee8b492592568805593f81f8cdf2a04c
 PKG_SOURCE_URL:=@SF/expat
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
@@ -39,7 +40,7 @@ CONFIGURE_ARGS += \
        --enable-static
 
 define Build/Compile
-       $(MAKE) -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/gd/Makefile b/libs/gd/Makefile
index 6d1a944f7b055ca6546530641dc1d470247400b2..ffe31ebfb9cda5c1279d4204c9659bfde63693dd 100644 (file)
--- a/libs/gd/Makefile
+++ b/libs/gd/Makefile
@@ -17,6 +17,7 @@ PKG_MD5SUM:=6c6c3dbb7bf079e0bb5fbbfd3bb8a71c
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/libs/gdbm/Makefile b/libs/gdbm/Makefile
index 751f22a288443e2c5ef6d9892da7379a7371e678..9d9c58cc0111fd97a8bfb9026b91418f5b07b03a 100644 (file)
--- a/libs/gdbm/Makefile
+++ b/libs/gdbm/Makefile
@@ -15,7 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gdbm
 PKG_MD5SUM:=1d1b1d5c0245b1c00aff92da751e9aa1
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -33,7 +34,7 @@ CONFIGURE_ARGS += \
        --enable-static \
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
+       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
                BINOWN=`id -u` \
                BINGRP=`id -g` \
                INSTALL_ROOT="$(PKG_INSTALL_DIR)" \

diff --git a/libs/jpeg/Makefile b/libs/jpeg/Makefile
index 43286516c79981b4f68357eecc2955905b55a137..a1522c0032fc89be44c84517452a8be4d6af65fa 100644 (file)
--- a/libs/jpeg/Makefile
+++ b/libs/jpeg/Makefile
@@ -16,7 +16,8 @@ PKG_SOURCE_URL:=http://www.ijg.org/files/ \
         ftp://ftp.uu.net/graphics/jpeg/
 PKG_MD5SUM:=dbd5f3b47ed13132f04c685d608a7547
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
@@ -63,7 +64,7 @@ endef
 
 define Build/Compile
        $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/{include,lib,bin,man/man1}
-       $(MAKE) -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/libevent/Makefile b/libs/libevent/Makefile
index ea06654441fc34df007cfac8d97f7234ef7a8402..de7f327c4873ca68c1d4490cb4b26ac3b56650f5 100644 (file)
--- a/libs/libevent/Makefile
+++ b/libs/libevent/Makefile
@@ -18,6 +18,7 @@ PKG_MD5SUM:=0b3ea18c634072d12b3c1ee734263664
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/libs/libgcrypt/Makefile b/libs/libgcrypt/Makefile
index f796c59802480fe45b0b290ab5e9c361dffe31df..20ee8073598402d7d25ecd9c6e91170833347db2 100644 (file)
--- a/libs/libgcrypt/Makefile
+++ b/libs/libgcrypt/Makefile
@@ -17,6 +17,7 @@ PKG_MD5SUM:=cc2017ad09b4543f8b3b5e9a53cfd89d
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/libs/libpng/Makefile b/libs/libpng/Makefile
index 786ac2e3e71a0b57aa23d1d3ca4073080ab77016..44db676e613a439b69819a3222c346a1c066a3df 100644 (file)
--- a/libs/libpng/Makefile
+++ b/libs/libpng/Makefile
@@ -17,6 +17,7 @@ PKG_MD5SUM:=e3ac7879d62ad166a6f0c7441390d12b
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk

diff --git a/libs/libxml2/Makefile b/libs/libxml2/Makefile
index 586a75618b7f03f794dd0aecbb0a20c91e02de67..d4cfa23cd37e3a35fde63f81d2bd984e58e7c482 100644 (file)
--- a/libs/libxml2/Makefile
+++ b/libs/libxml2/Makefile
@@ -18,6 +18,7 @@ PKG_MD5SUM:=9abc9959823ca9ff904f1fbcf21df066
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/libs/popt/Makefile b/libs/popt/Makefile
index 3a5b7542d818d2f8297f3ac7f6501af538a4be4f..035894491771f1f69d034db1659f8f25d9c057a6 100644 (file)
--- a/libs/popt/Makefile
+++ b/libs/popt/Makefile
@@ -17,6 +17,7 @@ PKG_MD5SUM:=5988e7aeb0ae4dac8d83561265984cc9
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/net/iperf/Makefile b/net/iperf/Makefile
index bf7027b18fc59ee511470fb21977d42ec3a1ab24..cddb35756231932107319c422b2b90ff123560f1 100644 (file)
--- a/net/iperf/Makefile
+++ b/net/iperf/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=44b5536b67719f4250faed632a3cd016
 
+PKG_BUILD_PARALLEL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/iperf/Default
@@ -57,7 +59,7 @@ define Build/Template
 $(STAMP_BUILT)-$(2): $(STAMP_PREPARED)
        -$(MAKE) -C $(PKG_BUILD_DIR) clean
        $(call Build/Configure/Default,$(3))
-       $(MAKE) -C $(PKG_BUILD_DIR)
+       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)
        ( cd $(PKG_BUILD_DIR)/src; mv -f iperf iperf-$(2) )
        touch $$@
 

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index c3b459efeb01dc0ee6d07a1884152d9386c2bf80..05a8078a10df6073b4eb6ad9517c7b62426ecc5d 100644 (file)
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -13,6 +13,7 @@ PKG_RELEASE:=4
 PKG_SOURCE:=netatalk-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/netatalk/
 PKG_MD5SUM:=f35cd7a4ce26c780de380cd2bcae5ce6
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index e6575345a1a77aee97ab4c5a794c52aae6fb8127..74e9db07acfd0694735467d549f5aa0ec8e08bf5 100644 (file)
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=http://rsync.samba.org/ftp/rsync/src
 PKG_MD5SUM:=b53525900817cf1ba7ad3a516ab5bfe9
 
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 931998076a51488d96ae01d01bebe85b76d10b9a..bdb99009d49154f18f4f12ec0de4ddcba599ce1a 100644 (file)
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -17,6 +17,7 @@ PKG_MD5SUM:=84fe15eb7e000fdc369def513299358b
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile
index c155b42c9878e986e51bfd849a62b435ee34e871..e0f364ca4977e207486e7e6c1cf45ee627abd6c6 100644 (file)
--- a/net/vnstat/Makefile
+++ b/net/vnstat/Makefile
@@ -17,7 +17,8 @@ PKG_MD5SUM:=95421d968689130590348ceb80ff74a8
 
 PKG_INSTALL:=1
 
-PKG_BUILD_DEPENDS:= libgd
+PKG_BUILD_DEPENDS:=libgd
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -59,13 +60,13 @@ define Package/vnstat/conffiles
 endef
 
 define Build/Compile/vnstat
-       $(MAKE) -C $(PKG_BUILD_DIR) \
+       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)"
 endef
 
 define Build/Compile/vnstati
-       $(MAKE) -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/wol/Makefile b/net/wol/Makefile
index 5ba8f4f1c1cbe06a2796376b2aa39ef1154a3535..afbfa55bd1bfb82820ae0064c05db2b643582b09 100644 (file)
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE_URL:=@SF/ahh
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MD5SUM:=c2fa9d7e771134ac8c89d56b8197d4ca
 
+PKG_BUILD_PARALLEL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/wol

diff --git a/utils/nano/Makefile b/utils/nano/Makefile
index 2673b0ae520092047389bfda41074a8687583f67..3df856ee8315a84656ac898ef5b2927b438078b5 100644 (file)
--- a/utils/nano/Makefile
+++ b/utils/nano/Makefile
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=http://www.nano-editor.org/dist/v2.2
 PKG_MD5SUM:=77a10a49589f975ce98350a4527a2ebf
 
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/utils/procps/Makefile b/utils/procps/Makefile
index 7a0ed3bf0baac0d3b969ddd92f6279939eab0bd7..8e16706bc93dcb3c16236f3283733ca255bbd317 100644 (file)
--- a/utils/procps/Makefile
+++ b/utils/procps/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://procps.sourceforge.net
 PKG_MD5SUM:=9532714b6846013ca9898984ba4cd7e0
 
+PKG_BUILD_PARALLEL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/procps