diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2013-08-22 10:05:40 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2013-08-22 10:05:40 +0400 |
| commit | 4c38db307e6d258d8601d4d62e3a5574440201bd (patch) | |
| tree | 331a9e2d65f1d40dddd9226be59cce424b9f3acd /build_files | |
| parent | ccc1fc1499936aab7a98a1ff6a3df93b62859a41 (diff) | |
Fix [#36534] Errors in install_deps.sh script when running on Arch Linux
Patch provided by Darren Beck, thanks!
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index ae16b4efaac..529812ea415 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -212,6 +212,7 @@ ILMBASE_SOURCE="http://download.savannah.nongnu.org/releases/openexr/ilmbase-$IL 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 @@ LLVM_SKIP=false # 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 @@ install_ARCH() { 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 |