[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52299] trunk/blender/build_files/ build_environment/install_deps.sh: Install dependencies: disable OSL for now
Sergey Sharybin
sergey.vfx at gmail.com
Sat Nov 17 12:57:12 CET 2012
Revision: 52299
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52299
Author: nazgul
Date: 2012-11-17 11:57:10 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
Install dependencies: disable OSL for now
It's really horror even for me to compile it on release environment,
i do not want anybody to spend time trying to support this lib in
automatic script or make it so user's are easily frustrated by some
hack added to OSL repository.
If you REALLY want to build OSL with this script, set BUILD_OSL to
truth (it's in the top of the script).
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 11:42:37 UTC (rev 52298)
+++ trunk/blender/build_files/build_environment/install_deps.sh 2012-11-17 11:57:10 UTC (rev 52299)
@@ -5,6 +5,11 @@
INST="/opt/lib"
CWD=$PWD
+# OSL is horror for manual building even
+# i would want it to be setteled for manual build first,
+# and only then do it automatically
+BUILD_OSL=false
+
THREADS=`cat /proc/cpuinfo | grep cores | uniq | sed -e "s/.*: *\(.*\)/\\1/"`
PYTHON_VERSION="3.3.0"
@@ -597,8 +602,6 @@
VORBIS_DEV="libvorbis-dev"
THEORA_DEV="libtheora-dev"
- have_llvm=false
-
sudo apt-get install -y 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 \
@@ -690,21 +693,25 @@
compile_OIIO
fi
- check_package_DEB llvm-$LLVM_VERSION-dev
- if [ $? -eq 0 ]; then
- sudo apt-get install -y llvm-$LLVM_VERSION-dev clang
- have_llvm=true
- else
- check_package_DEB llvm-$LLVM_VERSION_MIN-dev
+ if $BUILD_OSL; then
+ have_llvm=false
+
+ check_package_DEB llvm-$LLVM_VERSION-dev
if [ $? -eq 0 ]; then
- sudo apt-get install -y llvm-$LLVM_VERSION_MIN-dev clang
+ sudo apt-get install -y llvm-$LLVM_VERSION-dev clang
have_llvm=true
+ else
+ check_package_DEB llvm-$LLVM_VERSION_MIN-dev
+ if [ $? -eq 0 ]; then
+ sudo apt-get install -y llvm-$LLVM_VERSION_MIN-dev clang
+ have_llvm=true
+ fi
fi
- fi
- if $have_llvm; then
- # No package currently!
- compile_OSL
+ if $have_llvm; then
+ # No package currently!
+ compile_OSL
+ fi
fi
# XXX Debian features libav packages as ffmpeg, those are not really compatible with blender code currently :/
More information about the Bf-blender-cvs
mailing list