Commit: 317f29d753ae601d9c4817769059c7fb2aadfbd1 Author: Lawrence D'Oliveiro Date: Thu Feb 27 10:01:05 2014 +0100 https://developer.blender.org/rB317f29d753ae601d9c4817769059c7fb2aadfbd1
Resubmission: Avoid UUOC in install_deps.sh This is a resubmission of the original patch from D255. Sorry, I didn’t understand that subsequent patches added to a diff are considered to //override// previous ones, rather than add to them. Basically the comment for commit rB554eca1c288e has been applied to the wrong patch. Reviewers: mont29 Reviewed By: mont29 Differential Revision: https://developer.blender.org/D359 =================================================================== M build_files/build_environment/install_deps.sh =================================================================== diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 1fadf98..65fbd1b 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -45,10 +45,7 @@ WITH_ALL=false # Do not yet enable opencollada, use --with-opencollada (or --with-all) option to try it. WITH_OPENCOLLADA=false -THREADS=`cat /proc/cpuinfo | grep processor | wc -l` -if [ -z "$THREADS" ]; then - THREADS=1 -fi +THREADS=$(nproc) COMMON_INFO="\"Source code of dependencies needed to be compiled will be downloaded and extracted into '\$SRC'. Built libs of dependencies needed to be compiled will be installed into '\$INST'. _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
