[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59378] trunk/blender/build_files/ build_environment/install_deps.sh: Fix [#36534] Errors in install_deps. sh script when running on Arch Linux

Bastien Montagne montagne29 at wanadoo.fr
Thu Aug 22 08:05:41 CEST 2013


Revision: 59378
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59378
Author:   mont29
Date:     2013-08-22 06:05:40 +0000 (Thu, 22 Aug 2013)
Log Message:
-----------
Fix [#36534] Errors in install_deps.sh script when running on Arch Linux

Patch provided by Darren Beck, thanks!

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	2013-08-22 00:50:10 UTC (rev 59377)
+++ trunk/blender/build_files/build_environment/install_deps.sh	2013-08-22 06:05:40 UTC (rev 59378)
@@ -212,6 +212,7 @@
 OPENEXR_FORCE_REBUILD=false
 OPENEXR_SKIP=false
 _with_built_openexr=false
+_need_openexr_ldconfig=false
 
 OIIO_VERSION="1.1.10"
 OIIO_SOURCE="https://github.com/OpenImageIO/oiio/archive/Release-$OIIO_VERSION.tar.gz"
@@ -230,6 +231,7 @@
 
 # OSL needs to be compiled for now!
 OSL_VERSION="1.3.2"
+OSL_VERSION_MIN=$OSL_VERSION
 OSL_SOURCE="https://github.com/imageworks/OpenShadingLanguage/archive/Release-$OSL_VERSION.tar.gz"
 OSL_FORCE_REBUILD=false
 OSL_SKIP=false
@@ -2776,7 +2778,7 @@
       if [ $? -eq 0 ]; then
         install_packages_ARCH llvm clang
         have_llvm=true
-        LLVM_VERSION=`check_package_version_ge_ARCH llvm`
+        LLVM_VERSION=`check_package_version_ge_ARCH llvm $LLVM_VERSION_MIN`
         LLVM_VERSION_FOUND=$LLVM_VERSION
         clean_LLVM
       else




More information about the Bf-blender-cvs mailing list