From 8e5fb3fb4ab09b4dc04fe7cb3f7becce6514117b Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Sat, 11 Dec 2004 13:01:10 +0000
Subject: [PATCH] Add initial BR2_JLEVEL support, with some exceptions for apps
 that have broken 'make -j' support

---
 Config.in                  | 17 +++++++++++++----
 package/Makefile.in        |  3 +++
 package/flex/flex.mk       |  2 +-
 package/slang/slang.mk     |  2 +-
 toolchain/uClibc/uclibc.mk | 18 +++++++++---------
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/Config.in b/Config.in
index 8b15d11f3c..2b335e68b4 100644
--- a/Config.in
+++ b/Config.in
@@ -70,10 +70,16 @@ config BR2_ARCH
 	default "sparc"   if BR2_sparc
 
 
+menu "Build options"
+
 config BR2_WGET
-	string
+	string "Wget command"
 	default "wget --passive-ftp -nd"
 
+config BR2_TAR_VERBOSITY
+	bool "Tar verbose"
+	default n
+
 config BR2_STAGING_DIR
 	string "Toolchain and header file location?"
 	default "$(BUILD_DIR)/staging_dir"
@@ -87,10 +93,13 @@ config BR2_STAGING_DIR
 	    Most people will leave this set to the default value of
 	    "$(BUILD_DIR)/staging_dir".
 
+config BR2_JLEVEL
+	int "Number of jobs to run simultaneously"
+	default "1"
+	help
+	    Number of jobs to run simultanesouly
 
-config BR2_TAR_VERBOSITY
-	bool
-	default n
+endmenu
 
 source "toolchain/Config.in"
 
diff --git a/package/Makefile.in b/package/Makefile.in
index db523d21a3..a59ab973fb 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -1,3 +1,6 @@
+MAKE1=make
+MAKE=make -j$(BR2_JLEVEL)
+
 # Strip off the annoying quoting
 ARCH:=$(strip $(subst ",, $(BR2_ARCH)))
 #"
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index fa47ae69b6..6379fd922e 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -51,7 +51,7 @@ $(FLEX_DIR)/$(FLEX_BINARY): $(FLEX_DIR)/.configured
 	$(MAKE) -C $(FLEX_DIR)
 
 $(TARGET_DIR)/$(FLEX_TARGET_BINARY): $(FLEX_DIR)/$(FLEX_BINARY)
-	$(MAKE) \
+	$(MAKE1) \
 	    prefix=$(TARGET_DIR)/usr \
 	    exec_prefix=$(TARGET_DIR)/usr \
 	    bindir=$(TARGET_DIR)/usr/bin \
diff --git a/package/slang/slang.mk b/package/slang/slang.mk
index d1235943db..43c4bcaaa6 100644
--- a/package/slang/slang.mk
+++ b/package/slang/slang.mk
@@ -18,7 +18,7 @@ $(SLANG_DIR): $(DL_DIR)/$(SLANG_SOURCE)
 	bzcat $(DL_DIR)/$(SLANG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 
 $(SLANG_DIR)/libslang.so: $(SLANG_DIR)
-	$(MAKE) CFLAGS="-Os -g $(SLANG_CFLAGS)" CC=$(TARGET_CC) -C $(SLANG_DIR)
+	$(MAKE1) CFLAGS="-Os -g $(SLANG_CFLAGS)" CC=$(TARGET_CC) -C $(SLANG_DIR)
 	touch -c $(SLANG_DIR)/libslang.so;
 
 $(STAGING_DIR)/lib/libslang.so.1: $(SLANG_DIR)/libslang.so
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index bff50fd5b0..7d365cbd3b 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -72,7 +72,7 @@ endif
 	mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include
 	mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/lib
 	mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/lib
-	$(MAKE) -C $(UCLIBC_DIR) \
+	$(MAKE1) -C $(UCLIBC_DIR) \
 		PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
@@ -81,7 +81,7 @@ endif
 	touch $(UCLIBC_DIR)/.configured
 
 $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(LIBFLOAT_TARGET)
-	$(MAKE) -C $(UCLIBC_DIR) \
+	$(MAKE1) -C $(UCLIBC_DIR) \
 		PREFIX= \
 		DEVEL_PREFIX=/ \
 		RUNTIME_PREFIX=/ \
@@ -90,18 +90,18 @@ $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(LIBFLOAT_TARGET)
 	touch -c $(UCLIBC_DIR)/lib/libc.a
 
 $(STAGING_DIR)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
-	$(MAKE) -C $(UCLIBC_DIR) \
+	$(MAKE1) -C $(UCLIBC_DIR) \
 		PREFIX=$(STAGING_DIR)/ \
 		DEVEL_PREFIX=/ \
 		RUNTIME_PREFIX=/ \
 		install_runtime
-	$(MAKE) -C $(UCLIBC_DIR) \
+	$(MAKE1) -C $(UCLIBC_DIR) \
 		PREFIX=$(STAGING_DIR)/ \
 		DEVEL_PREFIX=/ \
 		RUNTIME_PREFIX=/ \
 		install_dev
 	# Build the host utils.  Need to add an install target...
-	$(MAKE) -C $(UCLIBC_DIR)/utils \
+	$(MAKE1) -C $(UCLIBC_DIR)/utils \
 		PREFIX=$(STAGING_DIR) \
 		HOSTCC="$(HOSTCC)" \
 		hostutils
@@ -109,7 +109,7 @@ $(STAGING_DIR)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
 
 ifneq ($(TARGET_DIR),)
 $(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/lib/libc.a
-	$(MAKE) -C $(UCLIBC_DIR) \
+	$(MAKE1) -C $(UCLIBC_DIR) \
 		PREFIX=$(TARGET_DIR) \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
@@ -117,7 +117,7 @@ $(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/lib/libc.a
 	touch -c $(TARGET_DIR)/lib/libc.so.0
 
 $(TARGET_DIR)/usr/bin/ldd: gcc
-	$(MAKE) -C $(UCLIBC_DIR) $(TARGET_CONFIGURE_OPTS) \
+	$(MAKE1) -C $(UCLIBC_DIR) $(TARGET_CONFIGURE_OPTS) \
 		PREFIX=$(TARGET_DIR) utils install_utils
 	touch -c $(TARGET_DIR)/usr/bin/ldd
 
@@ -134,7 +134,7 @@ uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE)
 uclibc-configured-source: uclibc-source
 
 uclibc-clean:
-	-$(MAKE) -C $(UCLIBC_DIR) clean
+	-$(MAKE1) -C $(UCLIBC_DIR) clean
 	rm -f $(UCLIBC_DIR)/.config
 
 uclibc-dirclean:
@@ -150,7 +150,7 @@ uclibc-target-utils: $(TARGET_DIR)/usr/bin/ldd
 #############################################################
 
 $(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib/libc.a
-	$(MAKE) -C $(UCLIBC_DIR) \
+	$(MAKE1) -C $(UCLIBC_DIR) \
 		PREFIX=$(TARGET_DIR) \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
-- 
2.30.2