[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52244] trunk/blender/build_files/buildbot /config: Enable OSL for linux 32 bit builders, it should work now

[Sergey Sharybin]

Revision: 52244
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52244
Author:   nazgul
Date:     2012-11-15 19:26:11 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
Enable OSL for linux 32 bit builders, it should work now

Modified Paths:
--------------
    trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py
    trunk/blender/build_files/buildbot/config/user-config-glibc27-i686.py

Modified: trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py	2012-11-15 19:11:06 UTC (rev 52243)
+++ trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py	2012-11-15 19:26:11 UTC (rev 52244)
@@ -120,7 +120,7 @@
 BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/libOpenImageIO.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_JPEG}/lib/libjpeg.a'
 BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
 
-WITH_BF_CYCLES_OSL = False
+WITH_BF_CYCLES_OSL = True
 WITH_BF_STATICOSL = False
 BF_OSL = '/opt/lib/osl'
 BF_OSL_INC = '${BF_OSL}/include'
@@ -130,7 +130,7 @@
 BF_OSL_LIBPATH = '${BF_OSL}/lib'
 BF_OSL_COMPILER = '${BF_OSL}/bin/oslc'
 
-WITH_BF_LLVM = False
+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 ' + \
@@ -162,6 +162,4 @@
 BF_DEBUG = False
 REL_CCFLAGS = ['-O2', '-msse', '-msse2']  # C & C++
 PLATFORM_LINKFLAGS = ['-lrt']
-
-if WITH_BF_CYCLES_OSL:
-	BF_PROGRAM_LINKFLAGS = ['-Wl,--whole-archive', '-loslexec', '-Wl,--no-whole-archive']
+BF_PROGRAM_LINKFLAGS = ['-Wl,--whole-archive', '-loslexec', '-Wl,--no-whole-archive']

Modified: trunk/blender/build_files/buildbot/config/user-config-glibc27-i686.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-glibc27-i686.py	2012-11-15 19:11:06 UTC (rev 52243)
+++ trunk/blender/build_files/buildbot/config/user-config-glibc27-i686.py	2012-11-15 19:26:11 UTC (rev 52244)
@@ -107,7 +107,7 @@
 BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/libOpenImageIO.a ${BF_OPENEXR}/lib/libIlmImf.a'
 BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
 
-WITH_BF_CYCLES_OSL = False
+WITH_BF_CYCLES_OSL = True
 WITH_BF_STATICOSL = False
 BF_OSL = '/opt/osl'
 BF_OSL_INC = '${BF_OSL}/include'
@@ -117,7 +117,7 @@
 BF_OSL_LIBPATH = '${BF_OSL}/lib'
 BF_OSL_COMPILER = '${BF_OSL}/bin/oslc'
 
-WITH_BF_LLVM = False
+WITH_BF_LLVM = True
 WITH_BF_STATICLLVM = False
 BF_LLVM = '/opt/llvm-3.1'
 BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc LLVMX86Info LLVMX86AsmPrinter ' + \
@@ -147,6 +147,4 @@
 BF_DEBUG = False
 REL_CCFLAGS = ['-O2']  # C & C++
 PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib32']
-
-if WITH_BF_CYCLES_OSL:
-	BF_PROGRAM_LINKFLAGS = ['-Wl,--whole-archive', '-loslexec', '-Wl,--no-whole-archive']
+BF_PROGRAM_LINKFLAGS = ['-Wl,--whole-archive', '-loslexec', '-Wl,--no-whole-archive']