From 2c51978d2b61b7a8c4c3c14bf5a9a8d573a8120a Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Mon, 28 Jul 2014 23:00:21 +0600
Subject: [PATCH] Switch buildbot to new llvm/oiio/osl

---
 build_files/buildbot/config/user-config-glibc211-i686.py   | 6 +++---
 build_files/buildbot/config/user-config-glibc211-x86_64.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build_files/buildbot/config/user-config-glibc211-i686.py b/build_files/buildbot/config/user-config-glibc211-i686.py
index 41d6a4a78dc..d7a1439e003 100644
--- a/build_files/buildbot/config/user-config-glibc211-i686.py
+++ b/build_files/buildbot/config/user-config-glibc211-i686.py
@@ -22,7 +22,7 @@ BF_OPENCOLLADA_LIB_STATIC = '${BF_OPENCOLLADA}/lib/libOpenCOLLADAStreamWriter.a
     '${BF_OPENCOLLADA}/lib/libOpenCOLLADAFramework.a ' + \
     '${BF_OPENCOLLADA}/lib/libOpenCOLLADABaseUtils.a ' + \
     '${BF_OPENCOLLADA}/lib/libGeneratedSaxParser.a '  + \
-    '${BF_OPENCOLLADA}/lib/libUTF.a ${BF_OPENCOLLADA}/lib/libMathMLSolver.a ' + \
+    '${BF_OPENCOLLADA}/lib/libMathMLSolver.a ' + \
     '${BF_OPENCOLLADA}/lib/libbuffer.a ${BF_OPENCOLLADA}/lib/libftoa.a ' + \
     '/usr/lib/libxml2.a /usr/lib/libexpat.a /usr/lib/libpcre.a'
 BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib /home/sources/staticlibs/lib64'
@@ -134,8 +134,8 @@ BF_OSL_COMPILER = '${BF_OSL}/bin/oslc'
 
 WITH_BF_LLVM = True
 WITH_BF_STATICLLVM = False
-BF_LLVM = '/opt/lib/llvm-3.1'
-BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc LLVMX86Info LLVMX86AsmPrinter ' + \
+BF_LLVM = '/opt/lib/llvm-3.4.2'
+BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc LLVMObject LLVMX86Info LLVMX86AsmPrinter ' + \
     'LLVMX86Utils LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMInstCombine LLVMTransformUtils LLVMipa LLVMAnalysis LLVMExecutionEngine ' + \
     'LLVMTarget LLVMMC LLVMCore LLVMSupport'
 BF_LLVM_LIBPATH = '${BF_LLVM}/lib'
diff --git a/build_files/buildbot/config/user-config-glibc211-x86_64.py b/build_files/buildbot/config/user-config-glibc211-x86_64.py
index d94923cc39d..f07c447bf29 100644
--- a/build_files/buildbot/config/user-config-glibc211-x86_64.py
+++ b/build_files/buildbot/config/user-config-glibc211-x86_64.py
@@ -22,7 +22,7 @@ BF_OPENCOLLADA_LIB_STATIC = '${BF_OPENCOLLADA}/lib/libOpenCOLLADAStreamWriter.a
     '${BF_OPENCOLLADA}/lib/libOpenCOLLADAFramework.a ' + \
     '${BF_OPENCOLLADA}/lib/libOpenCOLLADABaseUtils.a ' + \
     '${BF_OPENCOLLADA}/lib/libGeneratedSaxParser.a '  + \
-    '${BF_OPENCOLLADA}/lib/libUTF.a ${BF_OPENCOLLADA}/lib/libMathMLSolver.a ' + \
+    '${BF_OPENCOLLADA}/lib/libMathMLSolver.a ' + \
     '${BF_OPENCOLLADA}/lib/libbuffer.a ${BF_OPENCOLLADA}/lib/libftoa.a ' + \
     '/usr/lib/libxml2.a /usr/lib/libexpat.a /usr/lib/libpcre.a'
 BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib /home/sources/staticlibs/lib64'
@@ -134,8 +134,8 @@ BF_OSL_COMPILER = '${BF_OSL}/bin/oslc'
 
 WITH_BF_LLVM = True
 WITH_BF_STATICLLVM = False
-BF_LLVM = '/opt/lib/llvm-3.1'
-BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc LLVMX86Info LLVMX86AsmPrinter ' + \
+BF_LLVM = '/opt/lib/llvm-3.4.2'
+BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc LLVMObject LLVMX86Info LLVMX86AsmPrinter ' + \
     'LLVMX86Utils LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMInstCombine LLVMTransformUtils LLVMipa LLVMAnalysis LLVMExecutionEngine ' + \
     'LLVMTarget LLVMMC LLVMCore LLVMSupport'
 BF_LLVM_LIBPATH = '${BF_LLVM}/lib'