[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 55904cd2b463983987f769c8dfd3691ced1d7912

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 1600 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  55904cd2b463983987f769c8dfd3691ced1d7912 (commit)
      from  860ad8cb1551ff0ec5b7da3d28bb9e358470382b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 55904cd2b463983987f769c8dfd3691ced1d7912
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Sep 29 14:38:41 2013 +0200

    make.sh: Automatically determine parallelism flags.

-----------------------------------------------------------------------

Summary of changes:
 make.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/make.sh b/make.sh
index 814b14a..61b4013 100755
--- a/make.sh
+++ b/make.sh
@@ -179,11 +179,12 @@ prepareenv() {
     set +h
     LC_ALL=POSIX
     if [ -z $MAKETUNING ]; then
-        if [ "${MACHINE:0:3}" = "arm" ]; then
-            MAKETUNING="-j2"
-        else
-            MAKETUNING="-j6"
-        fi
+	CPU_COUNT="$(getconf _NPROCESSORS_ONLN 2>/dev/null)"
+	if [ -z "${CPU_COUNT}" ]; then
+		CPU_COUNT=1
+	fi
+
+	MAKETUNING="-j$(( ${CPU_COUNT} * 2 + 1 ))"
     fi
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD


hooks/post-receive
--
IPFire 2.x development tree