[Bf-blender-cvs] [95de7b9] blender-v2.77-release: Fix T47939: Install Deps OSL 1.7.1 and clang-3.5

Bastien Montagne noreply at git.blender.org
Tue Apr 5 10:46:44 CEST 2016


Commit: 95de7b9a5fb378e77303fe401569e323cdd7896e
Author: Bastien Montagne
Date:   Sat Mar 26 00:31:41 2016 +0100
Branches: blender-v2.77-release
https://developer.blender.org/rB95de7b9a5fb378e77303fe401569e323cdd7896e

Fix T47939: Install Deps OSL 1.7.1 and clang-3.5

Until we officially support llvm3.5 or more, only allow for 3.4 llvm packages,
and build own stuff otherwise...

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

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 9b080f7..9024ff0 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -2649,15 +2649,15 @@ install_DEB() {
       LLVM_VERSION_FOUND=$LLVM_VERSION
       clean_LLVM
     else
-      check_package_version_ge_DEB llvm-dev $LLVM_VERSION_MIN
-      if [ $? -eq 0 ]; then
-        install_packages_DEB llvm-dev clang
-        have_llvm=true
-        LLVM_VERSION_FOUND=""  # Using default one, no need to specify it!
-        clean_LLVM
-      else
-        _do_compile_llvm=true
-      fi
+      #~ check_package_version_ge_DEB llvm-dev $LLVM_VERSION_MIN
+      #~ if [ $? -eq 0 ]; then
+        #~ install_packages_DEB llvm-dev clang
+        #~ have_llvm=true
+        #~ LLVM_VERSION_FOUND=""  # Using default one, no need to specify it!
+        #~ clean_LLVM
+      #~ else
+      _do_compile_llvm=true
+      #~ fi
     fi
   fi
 
@@ -3563,7 +3563,7 @@ install_ARCH() {
     INFO "Forced LLVM building, as requested..."
     _do_compile_llvm=true
   else
-    check_package_version_ge_ARCH llvm $LLVM_VERSION_MIN
+    check_package_version_match_ARCH llvm $LLVM_VERSION
     if [ $? -eq 0 ]; then
       install_packages_ARCH llvm clang
       have_llvm=true




More information about the Bf-blender-cvs mailing list