Mercurial > trustbridge
changeset 887:accda55ae053
Use make -j`nproc` everywhere instead of fixed number
author | Andre Heinecke <andre.heinecke@intevation.de> |
---|---|
date | Fri, 08 Aug 2014 11:07:49 +0200 |
parents | 197c594aad2b |
children | be3cb357b027 |
files | INSTALL packaging/create-dist-package.sh.in |
diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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-@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"