[Bf-blender-cvs] [14f2ae4] master: install_deps.sh: fix (hopefully) broken OSL building on modern RPM-like distro.

[Bastien Montagne]

Commit: 14f2ae4bbc58f051db97ea96f78d39a6d7dae527
Author: Bastien Montagne
Date:   Wed Dec 9 21:56:47 2015 +0100
Branches: master
https://developer.blender.org/rB14f2ae4bbc58f051db97ea96f78d39a6d7dae527

install_deps.sh: fix (hopefully) broken OSL building on modern RPM-like distro.

Those stupid ones only have one version of llvm (obviously not 3.4 one ;) ), so we have to build again
LLVM3.4 in those cases. Thing is,
* I did not update LLVM magic number when fixed a stupid typo breaking OSL building (the terminfo thing),
  so many people were still using previously-built LLVM.
* Even worse, options passed to OSL to specify own LLVM from /opt/lib were wrong (not sure when this got
  out of sync...).

Thanks to mib2berlin and slikdigit for the report & testings!

===================================================================

M	build_files/build_environment/install_deps.sh

===================================================================

diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 70c568d..e98a84f 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -1527,7 +1527,7 @@ clean_LLVM() {
 
 compile_LLVM() {
   # To be changed each time we make edits that would modify the compiled result!
-  llvm_magic=2
+  llvm_magic=3
   _init_llvm
 
   # Clean install if needed!
@@ -1700,7 +1700,7 @@ compile_OSL() {
     if [ ! -z $LLVM_VERSION_FOUND ]; then
       cmake_d="$cmake_d -D LLVM_VERSION=$LLVM_VERSION_FOUND"
       if [ -d $INST/llvm ]; then
-        cmake_d="$cmake_d -D LLVM_ROOT_DIR=$INST/llvm"
+        cmake_d="$cmake_d -D LLVM_DIRECTORY=$INST/llvm"
         cmake_d="$cmake_d -D LLVM_STATIC=ON"
       fi
     fi