From 7b30b70e11b8a7e90eddaa33468118bf1628a3ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20B=C3=BCsch?= <mb@bu3sch.de> Date: Tue, 7 Sep 2010 10:00:34 +0000 Subject: [PATCH] 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: 22965 --- package/busybox/Makefile | 4 +++- package/cyassl/Makefile | 1 + package/dropbear/Makefile | 6 ++++-- package/iptables/Makefile | 1 + package/mac80211/Makefile | 3 ++- package/ncurses/Makefile | 1 + package/zlib/Makefile | 4 +++- 7 files changed, 15 insertions(+), 5 deletions(-) diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 7e7e447b44..4ea9a61e4e 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -16,6 +16,8 @@ PKG_SOURCE_URL:=http://www.busybox.net/downloads \ http://distfiles.gentoo.org/distfiles/ PKG_MD5SUM:=7360b7138b899ee7fc885791c740c3c3 +PKG_BUILD_PARALLEL:=1 + include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) @@ -65,7 +67,7 @@ ifdef CONFIG_GCC_VERSION_4_5_0 endif define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ + $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ KBUILD_HAVE_NLS=no \ diff --git a/package/cyassl/Makefile b/package/cyassl/Makefile index a8168ec4c9..d8e5bae139 100644 --- a/package/cyassl/Makefile +++ b/package/cyassl/Makefile @@ -17,6 +17,7 @@ PKG_MD5SUM:=037397c7df84b9a12e614bf46135df1c PKG_FIXUP:=libtool PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 77d6d9707b..6fad273660 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -17,6 +17,8 @@ PKG_SOURCE_URL:= \ http://www.mirrors.wiretapped.net/security/cryptography/apps/ssh/dropbear/ PKG_MD5SUM:=1c69ec674481d7745452f68f2ea5597e +PKG_BUILD_PARALLEL:=1 + include $(INCLUDE_DIR)/package.mk define Package/dropbear/Default @@ -70,12 +72,12 @@ define Build/Configure endef define Build/Compile - $(MAKE) -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) -C $(PKG_BUILD_DIR) \ + $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ LD="$(TARGET_CC)" \ PROGRAMS="dropbearconvert" diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 08b1450703..8609b6d7c4 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -21,6 +21,7 @@ PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \ PKG_FIXUP:=libtool PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 450f8443df..f3b441c8f6 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -19,6 +19,7 @@ PKG_MD5SUM:=5d720b6d8de97ae61a4c3e4ee10a6de1 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION) +PKG_BUILD_PARALLEL:=1 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_kmod-mac80211 \ @@ -955,7 +956,7 @@ endef ifneq ($(CONFIG_PACKAGE_kmod-cfg80211),) define Build/Compile/kmod rm -rf $(PKG_BUILD_DIR)/modules - $(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_OPTS) all + $(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" $(MAKE_OPTS) all endef endif diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index cbbb098cb2..8fac06eca1 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -17,6 +17,7 @@ PKG_SOURCE_URL:=@GNU/ncurses PKG_MD5SUM:=cce05daf61a64501ef6cd8da1f727ec6 PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/package/zlib/Makefile b/package/zlib/Makefile index c6a18378dc..bcd6ae040a 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.zlib.net @SF/libpng PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6 +PKG_BUILD_PARALLEL:=1 + include $(INCLUDE_DIR)/package.mk define Package/zlib @@ -37,7 +39,7 @@ define Build/Configure endef define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ + $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ LDSHARED="$(TARGET_CROSS)ld -shared" \ CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \ -- GitLab