[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 26b34186b3788b9ee58246e5b09748ea7b6df6b3

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 1603 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, fifteen has been updated
       via  26b34186b3788b9ee58246e5b09748ea7b6df6b3 (commit)
      from  70c11aa670816d5cba6cd8e8cb89079e52b8fd2c (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 26b34186b3788b9ee58246e5b09748ea7b6df6b3
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 2ada028..fe3634f 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