From eae0174b0404aebe9eea5cc10910b626555af250 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sat, 17 Nov 2012 11:57:10 +0000 Subject: [PATCH] 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). --- build_files/build_environment/install_deps.sh | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index b8ce10891eb..9cbd6cd636b 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -5,6 +5,11 @@ SRC="$HOME/src/blender-deps" 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 @@ install_DEB() { 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 @@ install_DEB() { 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 [ $? -eq 0 ]; then - sudo apt-get install -y llvm-$LLVM_VERSION_MIN-dev clang - have_llvm=true - fi - fi + if $BUILD_OSL; then + have_llvm=false - if $have_llvm; then - # No package currently! - compile_OSL + 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 [ $? -eq 0 ]; then + sudo apt-get install -y llvm-$LLVM_VERSION_MIN-dev clang + have_llvm=true + fi + fi + + 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 :/