diff --git a/libreoffice-help-en-US.spec b/libreoffice-help-en-US.spec index cfd42e4..f65f7bd 100644 --- a/libreoffice-help-en-US.spec +++ b/libreoffice-help-en-US.spec @@ -209,7 +209,7 @@ fi PARALLEL_BUILD= if test -n "$lo_jobs" ; then PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P%jobs" + BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" fi # parallel build of modules # it makes sense on machines with more CPUs @@ -217,7 +217,7 @@ num_cpus=`grep ^processor /proc/cpuinfo | wc -l` # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" # using icecream if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" diff --git a/libreoffice-help-en-US.spec.in b/libreoffice-help-en-US.spec.in index debe078..49dd243 100644 --- a/libreoffice-help-en-US.spec.in +++ b/libreoffice-help-en-US.spec.in @@ -205,7 +205,7 @@ fi PARALLEL_BUILD= if test -n "$lo_jobs" ; then PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P%jobs" + BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" fi # parallel build of modules # it makes sense on machines with more CPUs @@ -213,7 +213,7 @@ num_cpus=`grep ^processor /proc/cpuinfo | wc -l` # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" # using icecream if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" diff --git a/libreoffice-help-group1.spec b/libreoffice-help-group1.spec index 239f55d..1a9e687 100644 --- a/libreoffice-help-group1.spec +++ b/libreoffice-help-group1.spec @@ -304,7 +304,7 @@ fi PARALLEL_BUILD= if test -n "$lo_jobs" ; then PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P%jobs" + BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" fi # parallel build of modules # it makes sense on machines with more CPUs @@ -312,7 +312,7 @@ num_cpus=`grep ^processor /proc/cpuinfo | wc -l` # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" # using icecream if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" diff --git a/libreoffice-help-group2.spec b/libreoffice-help-group2.spec index fe845b5..7e14455 100644 --- a/libreoffice-help-group2.spec +++ b/libreoffice-help-group2.spec @@ -322,7 +322,7 @@ fi PARALLEL_BUILD= if test -n "$lo_jobs" ; then PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P%jobs" + BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" fi # parallel build of modules # it makes sense on machines with more CPUs @@ -330,7 +330,7 @@ num_cpus=`grep ^processor /proc/cpuinfo | wc -l` # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" # using icecream if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" diff --git a/libreoffice-help-group3.spec b/libreoffice-help-group3.spec index bcac587..c431240 100644 --- a/libreoffice-help-group3.spec +++ b/libreoffice-help-group3.spec @@ -361,7 +361,7 @@ fi PARALLEL_BUILD= if test -n "$lo_jobs" ; then PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P%jobs" + BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" fi # parallel build of modules # it makes sense on machines with more CPUs @@ -369,7 +369,7 @@ num_cpus=`grep ^processor /proc/cpuinfo | wc -l` # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" # using icecream if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" diff --git a/libreoffice-help-group4.spec b/libreoffice-help-group4.spec index 57d2292..1ed3b14 100644 --- a/libreoffice-help-group4.spec +++ b/libreoffice-help-group4.spec @@ -295,7 +295,7 @@ fi PARALLEL_BUILD= if test -n "$lo_jobs" ; then PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P%jobs" + BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" fi # parallel build of modules # it makes sense on machines with more CPUs @@ -303,7 +303,7 @@ num_cpus=`grep ^processor /proc/cpuinfo | wc -l` # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" # using icecream if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" diff --git a/libreoffice-help-group5.spec b/libreoffice-help-group5.spec index 7d6d4a7..2e87778 100644 --- a/libreoffice-help-group5.spec +++ b/libreoffice-help-group5.spec @@ -349,7 +349,7 @@ fi PARALLEL_BUILD= if test -n "$lo_jobs" ; then PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P%jobs" + BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" fi # parallel build of modules # it makes sense on machines with more CPUs @@ -357,7 +357,7 @@ num_cpus=`grep ^processor /proc/cpuinfo | wc -l` # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" # using icecream if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" diff --git a/libreoffice-help-groupX.spec.in b/libreoffice-help-groupX.spec.in index 62937d1..d705428 100644 --- a/libreoffice-help-groupX.spec.in +++ b/libreoffice-help-groupX.spec.in @@ -181,7 +181,7 @@ fi PARALLEL_BUILD= if test -n "$lo_jobs" ; then PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P%jobs" + BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" fi # parallel build of modules # it makes sense on machines with more CPUs @@ -189,7 +189,7 @@ num_cpus=`grep ^processor /proc/cpuinfo | wc -l` # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" # using icecream if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream"