Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Resubmission: Avoid UUOC in install_deps.sh

Browse Source 
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
This commit is contained in:
Lawrence D'Oliveiro
2014-02-27 10:01:05 +01:00
committed by Bastien Montagne
parent 17d2e6422c
commit 317f29d753
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build_files/build_environment/install_deps.sh
View File

@@ -45,10 +45,7 @@ WITH_ALL=false
# Do not yet enable opencollada, use --with-opencollada (or --with-all) option to try it. # Do not yet enable opencollada, use --with-opencollada (or --with-all) option to try it.
WITH_OPENCOLLADA=false WITH_OPENCOLLADA=false
THREADS=`cat /proc/cpuinfo | grep processor | wc -l` THREADS=$(nproc)
if [ -z "$THREADS" ]; then
THREADS=1
fi
COMMON_INFO="\"Source code of dependencies needed to be compiled will be downloaded and extracted into '\$SRC'. 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'. Built libs of dependencies needed to be compiled will be installed into '\$INST'.