[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52306] trunk/blender/build_files/ build_environment/install_deps.sh: Mono-core platform seem to not output the cores field in /proc/cpuinfo :/

Bastien Montagne montagne29 at wanadoo.fr
Sat Nov 17 15:41:20 CET 2012


Revision: 52306
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52306
Author:   mont29
Date:     2012-11-17 14:41:18 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
Mono-core platform seem to not output the cores field in /proc/cpuinfo :/
Also adding gawk packages (gnu awk), looks like some distro do not have that one by default!

Modified Paths:
--------------
    trunk/blender/build_files/build_environment/install_deps.sh

Modified: trunk/blender/build_files/build_environment/install_deps.sh
===================================================================
--- trunk/blender/build_files/build_environment/install_deps.sh	2012-11-17 14:35:35 UTC (rev 52305)
+++ trunk/blender/build_files/build_environment/install_deps.sh	2012-11-17 14:41:18 UTC (rev 52306)
@@ -11,6 +11,9 @@
 BUILD_OSL=false
 
 THREADS=`cat /proc/cpuinfo | grep cores | uniq | sed -e "s/.*: *\(.*\)/\\1/"`
+if [ -z "$v" ]; then
+  THREADS=1
+fi
 
 PYTHON_VERSION="3.3.0"
 PYTHON_VERSION_MIN="3.3"
@@ -639,7 +642,7 @@
   VORBIS_DEV="libvorbis-dev"
   THEORA_DEV="libtheora-dev"
 
-  sudo apt-get install -y cmake scons gcc g++ libjpeg-dev libpng-dev libtiff-dev \
+  sudo apt-get install -y gawk cmake scons gcc g++ libjpeg-dev libpng-dev libtiff-dev \
     libfreetype6-dev libx11-dev libxi-dev wget libsqlite3-dev libbz2-dev libncurses5-dev \
     libssl-dev liblzma-dev libreadline-dev $OPENJPEG_DEV libopenexr-dev libopenal-dev \
     libglew-dev yasm $SCHRO_DEV $THEORA_DEV $VORBIS_DEV libsdl1.2-dev \
@@ -809,7 +812,7 @@
 
   sudo yum -y update
 
-  sudo yum -y install gcc gcc-c++ cmake scons libpng-devel libtiff-devel \
+  sudo yum -y install gawk gcc gcc-c++ cmake scons libpng-devel libtiff-devel \
     freetype-devel libX11-devel libXi-devel wget libsqlite3x-devel ncurses-devel \
     readline-devel openjpeg-devel openexr-devel openal-soft-devel \
     glew-devel yasm schroedinger-devel libtheora-devel libvorbis-devel SDL-devel \




More information about the Bf-blender-cvs mailing list