[PATCH 1 of 2] Use make -j`nproc` everywhere instead of fixed number

Wald Commits scm-commit at wald.intevation.org
Fri Aug 8 11:08:10 CEST 2014


# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1407488869 -7200
# Node ID accda55ae0538dd197dd9602c3602daf1335cb4c
# Parent  197c594aad2b76932209074a266b73507e2db30d
Use make -j`nproc` everywhere instead of fixed number

diff -r 197c594aad2b -r accda55ae053 INSTALL
--- a/INSTALL	Fri Aug 08 10:59:40 2014 +0200
+++ b/INSTALL	Fri Aug 08 11:07:49 2014 +0200
@@ -37,18 +37,18 @@
     -no-directfb -no-opengl -no-kms -no-eglfs -no-egl -no-openssl -no-glib \
     -system-libpng -qpa xcb -qt-xkbcommon -qt-xcb -no-nis -no-libjpeg -qt-libpng \
     -qt-zlib -no-gif && \
-    nice make -j8 && \
+    nice make -j`nproc` && \
     make install
 
     cd .. && \
     cd qttools/src/designer/src/uitools && \
     qmake && \
-    nice make -j8 && \
+    nice make -j`nproc` && \
     make install
 
     cd ../../../linguist && \
     qmake && \
-    nice make -j8 &&\
+    nice make -j`nproc` &&\
     make install
 
     curl -O https://polarssl.org/download/polarssl-1.3.8-gpl.tgz
@@ -99,7 +99,7 @@
     -system-libpng -qpa xcb -qt-xcb -no-nis -no-libjpeg -no-gif -qt-zlib \
     -no-fontconfig -qt-freetype -qt-libpng -qt-xkbcommon \
     && \
-    nice make -j8 && \
+    nice make -j`nproc` && \
     make install
 
 Switch back to the polarssl directory
@@ -109,7 +109,7 @@
     cmake .. -DCMAKE_C_FLAGS="-fpic -m32" -DCMAKE_INSTALL_PREFIX=$YOURPREFIX/i386 \
          -DCMAKE_VERBOSE_MAKEFILE=True \
          -DENABLE_TESTING=FALSE -DENABLE_PROGRAMS=FALSE && \
-    nice make -j8 && \
+    nice make -j`nproc` && \
     make install
 
 Now for Trustbridge itself
diff -r 197c594aad2b -r accda55ae053 packaging/create-dist-package.sh.in
--- a/packaging/create-dist-package.sh.in	Fri Aug 08 10:59:40 2014 +0200
+++ b/packaging/create-dist-package.sh.in	Fri Aug 08 11:07:49 2014 +0200
@@ -23,10 +23,10 @@
 TMPDIR=$TMPD/TrustBridge- at PROJECT_VERSION@
 cd @CMAKE_SOURCE_DIR@/build-windows
 echo "Updating windows build"
-make
+make -j`nproc`
 cd @CMAKE_SOURCE_DIR@/build-i386
 echo "Building x86 package"
-make
+make -j`nproc`
 /bin/bash packaging/linux-createpackage.sh
 cd @CMAKE_BINARY_DIR@
 echo "Building amd64 package"


More information about the Trustbridge-commits mailing list