make.sh: Introduce DEFAULT_PARALLELISM

[ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 78fb2e41a3ba1d57212cedcc4c28743e53eae681..92f1ffa601e4c9e827a78e4021f2ffc44383c2ea 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -206,9 +206,7 @@ configure_build() {
                # 192MB of memory. Therefore we find out how
                # many processes fit into memory.
                local mem_max=$(( ${SYSTEM_MEMORY} / 192 ))
                # 192MB of memory. Therefore we find out how
                # many processes fit into memory.
                local mem_max=$(( ${SYSTEM_MEMORY} / 192 ))

-
-               local processors="$(system_processors)"
-               local cpu_max=$(( ${processors} + 1 ))
+               local cpu_max=$(( ${SYSTEM_PROCESSORS} + 1 ))

 
                local parallelism
                if [ ${mem_max} -lt ${cpu_max} ]; then
 
                local parallelism
                if [ ${mem_max} -lt ${cpu_max} ]; then


@@ -217,6 +215,9 @@ configure_build() {
                        parallelism=${cpu_max}
                fi
 
                        parallelism=${cpu_max}
                fi
 

+               # Use this as default PARALLELISM
+               DEFAULT_PARALLELISM="${parallelism}"
+

                # limit to -j23 because perl will not build
                # more
                if [ ${parallelism} -gt 23 ]; then
                # limit to -j23 because perl will not build
                # more
                if [ ${parallelism} -gt 23 ]; then


@@ -469,7 +470,7 @@ prepareenv() {
        # Setup environment
        set +h
        LC_ALL=POSIX
        # Setup environment
        set +h
        LC_ALL=POSIX

-       export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
+       export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM MAKETUNING

        unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
        # Make some extra directories
        unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
        # Make some extra directories


@@ -554,6 +555,7 @@ enterchroot() {
                CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
                KVER="${KVER}" \
                XZ_OPT="${XZ_OPT}" \
                CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
                KVER="${KVER}" \
                XZ_OPT="${XZ_OPT}" \

+               DEFAULT_PARALLELISM="${DEFAULT_PARALLELISM}" \

                SYSTEM_PROCESSORS="${SYSTEM_PROCESSORS}" \
                SYSTEM_MEMORY="${SYSTEM_MEMORY}" \
                $(fake_environ) \
                SYSTEM_PROCESSORS="${SYSTEM_PROCESSORS}" \
                SYSTEM_MEMORY="${SYSTEM_MEMORY}" \
                $(fake_environ) \


@@ -636,6 +638,7 @@ lfsmake1() {
                CFLAGS="${CFLAGS}" \
                CXXFLAGS="${CXXFLAGS}" \
                MAKETUNING="${MAKETUNING}" \
                CFLAGS="${CFLAGS}" \
                CXXFLAGS="${CXXFLAGS}" \
                MAKETUNING="${MAKETUNING}" \

+               DEFAULT_PARALLELISM="${DEFAULT_PARALLELISM}" \

                SYSTEM_PROCESSORS="${SYSTEM_PROCESSORS}" \
                SYSTEM_MEMORY="${SYSTEM_MEMORY}" \
                make -f $* \
                SYSTEM_PROCESSORS="${SYSTEM_PROCESSORS}" \
                SYSTEM_MEMORY="${SYSTEM_MEMORY}" \
                make -f $* \