From a85a0f57bc09b66509bbe4c6b72d23efcf7f515f Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 12 Feb 2013 08:30:12 +0000 Subject: Buildbot: revert r54465 and r54466 -- issue was not caused by crosscompilation, but was caused by some bugs in toolkit itself. Shall be all fine now (at least it is on my laptop now). Let give it another try! --- build_files/buildbot/config/user-config-glibc211-i686.py | 5 ++--- build_files/buildbot/config/user-config-glibc211-x86_64.py | 4 ++-- build_files/buildbot/slave_compile.py | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'build_files') diff --git a/build_files/buildbot/config/user-config-glibc211-i686.py b/build_files/buildbot/config/user-config-glibc211-i686.py index 97c55cafbe9..540416ee1fb 100644 --- a/build_files/buildbot/config/user-config-glibc211-i686.py +++ b/build_files/buildbot/config/user-config-glibc211-i686.py @@ -1,6 +1,7 @@ BF_BUILDDIR = '../blender-build/linux-glibc211-i686' BF_INSTALLDIR = '../blender-install/linux-glibc211-i686' BF_NUMJOBS = 4 +WITHOUT_BF_OVERWRITE_INSTALL = True # Python configuration BF_PYTHON_VERSION = '3.3' @@ -109,9 +110,7 @@ BF_JACK_LIB_STATIC = '${BF_ZLIB}/lib/libjack.a' # Cycles WITH_BF_CYCLES = True -WITH_BF_CYCLES_CUDA_BINARIES = True -#BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30'] -BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30'] +WITH_BF_CYCLES_CUDA_BINARIES = False WITH_BF_OIIO = True WITH_BF_STATICOIIO = True 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 1d43670b31d..c0ba8060712 100644 --- a/build_files/buildbot/config/user-config-glibc211-x86_64.py +++ b/build_files/buildbot/config/user-config-glibc211-x86_64.py @@ -1,6 +1,7 @@ BF_BUILDDIR = '../blender-build/linux-glibc211-x86_64' BF_INSTALLDIR = '../blender-install/linux-glibc211-x86_64' BF_NUMJOBS = 4 +WITHOUT_BF_OVERWRITE_INSTALL = True # Python configuration BF_PYTHON_VERSION = '3.3' @@ -109,8 +110,7 @@ BF_JACK_LIB_STATIC = '${BF_ZLIB}/lib/libjack.a' # Cycles WITH_BF_CYCLES = True -WITH_BF_CYCLES_CUDA_BINARIES = True -BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30'] +WITH_BF_CYCLES_CUDA_BINARIES = False WITH_BF_OIIO = True WITH_BF_STATICOIIO = True diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index ae9a84ab22c..dab8a8e6483 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -63,14 +63,14 @@ else: configs = [] if builder.endswith('linux_glibc211_x86_64_scons'): configs = ['user-config-player-glibc211-x86_64.py', - #'user-config-cuda-glibc211-x86_64.py', + 'user-config-cuda-glibc211-x86_64.py', 'user-config-glibc211-x86_64.py' ] chroot_name = 'buildbot_squeeze_x86_64' cuda_chroot = 'buildbot_squeeze_x86_64' elif builder.endswith('linux_glibc211_i386_scons'): configs = ['user-config-player-glibc211-i686.py', - #'user-config-cuda-glibc211-i686.py', + 'user-config-cuda-glibc211-i686.py', 'user-config-glibc211-i686.py'] chroot_name = 'buildbot_squeeze_i686' -- cgit v1.2.3