[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52295] trunk/blender/build_files/ build_environment/install_deps.sh: Install dependencies: made it sure llvm-3.1 or llvm-3.0 is installing

Sergey Sharybin sergey.vfx at gmail.com
Sat Nov 17 12:23:57 CET 2012


Revision: 52295
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52295
Author:   nazgul
Date:     2012-11-17 11:23:53 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
Install dependencies: made it sure llvm-3.1 or llvm-3.0 is installing

llvm-dev could be a meta-package for older version of llvm

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:07:46 UTC (rev 52294)
+++ trunk/blender/build_files/build_environment/install_deps.sh	2012-11-17 11:23:53 UTC (rev 52295)
@@ -590,11 +590,13 @@
   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 \
     libglew-dev yasm $SCHRO_DEV $THEORA_DEV $VORBIS_DEV libsdl1.2-dev \
-    libfftw3-dev libjack-dev python-dev patch flex bison llvm-dev clang libtbb-dev git
+    libfftw3-dev libjack-dev python-dev patch flex bison libtbb-dev git
 
   OPENJPEG_USE=true
   SCHRO_USE=true
@@ -681,9 +683,23 @@
     compile_OIIO
   fi
 
-  # 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
+
 #  XXX Debian features libav packages as ffmpeg, those are not really compatible with blender code currently :/
 #      So for now, always build our own ffmpeg.
 #  check_package_DEB ffmpeg




More information about the Bf-blender-cvs mailing list