forked from bartvdbraak/blender
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!
This commit is contained in:
parent
027a426c4d
commit
a85a0f57bc
@ -1,6 +1,7 @@
|
|||||||
BF_BUILDDIR = '../blender-build/linux-glibc211-i686'
|
BF_BUILDDIR = '../blender-build/linux-glibc211-i686'
|
||||||
BF_INSTALLDIR = '../blender-install/linux-glibc211-i686'
|
BF_INSTALLDIR = '../blender-install/linux-glibc211-i686'
|
||||||
BF_NUMJOBS = 4
|
BF_NUMJOBS = 4
|
||||||
|
WITHOUT_BF_OVERWRITE_INSTALL = True
|
||||||
|
|
||||||
# Python configuration
|
# Python configuration
|
||||||
BF_PYTHON_VERSION = '3.3'
|
BF_PYTHON_VERSION = '3.3'
|
||||||
@ -109,9 +110,7 @@ BF_JACK_LIB_STATIC = '${BF_ZLIB}/lib/libjack.a'
|
|||||||
|
|
||||||
# Cycles
|
# Cycles
|
||||||
WITH_BF_CYCLES = True
|
WITH_BF_CYCLES = True
|
||||||
WITH_BF_CYCLES_CUDA_BINARIES = True
|
WITH_BF_CYCLES_CUDA_BINARIES = False
|
||||||
#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_OIIO = True
|
WITH_BF_OIIO = True
|
||||||
WITH_BF_STATICOIIO = True
|
WITH_BF_STATICOIIO = True
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
BF_BUILDDIR = '../blender-build/linux-glibc211-x86_64'
|
BF_BUILDDIR = '../blender-build/linux-glibc211-x86_64'
|
||||||
BF_INSTALLDIR = '../blender-install/linux-glibc211-x86_64'
|
BF_INSTALLDIR = '../blender-install/linux-glibc211-x86_64'
|
||||||
BF_NUMJOBS = 4
|
BF_NUMJOBS = 4
|
||||||
|
WITHOUT_BF_OVERWRITE_INSTALL = True
|
||||||
|
|
||||||
# Python configuration
|
# Python configuration
|
||||||
BF_PYTHON_VERSION = '3.3'
|
BF_PYTHON_VERSION = '3.3'
|
||||||
@ -109,8 +110,7 @@ BF_JACK_LIB_STATIC = '${BF_ZLIB}/lib/libjack.a'
|
|||||||
|
|
||||||
# Cycles
|
# Cycles
|
||||||
WITH_BF_CYCLES = True
|
WITH_BF_CYCLES = True
|
||||||
WITH_BF_CYCLES_CUDA_BINARIES = True
|
WITH_BF_CYCLES_CUDA_BINARIES = False
|
||||||
BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
|
|
||||||
|
|
||||||
WITH_BF_OIIO = True
|
WITH_BF_OIIO = True
|
||||||
WITH_BF_STATICOIIO = True
|
WITH_BF_STATICOIIO = True
|
||||||
|
@ -63,14 +63,14 @@ else:
|
|||||||
configs = []
|
configs = []
|
||||||
if builder.endswith('linux_glibc211_x86_64_scons'):
|
if builder.endswith('linux_glibc211_x86_64_scons'):
|
||||||
configs = ['user-config-player-glibc211-x86_64.py',
|
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'
|
'user-config-glibc211-x86_64.py'
|
||||||
]
|
]
|
||||||
chroot_name = 'buildbot_squeeze_x86_64'
|
chroot_name = 'buildbot_squeeze_x86_64'
|
||||||
cuda_chroot = 'buildbot_squeeze_x86_64'
|
cuda_chroot = 'buildbot_squeeze_x86_64'
|
||||||
elif builder.endswith('linux_glibc211_i386_scons'):
|
elif builder.endswith('linux_glibc211_i386_scons'):
|
||||||
configs = ['user-config-player-glibc211-i686.py',
|
configs = ['user-config-player-glibc211-i686.py',
|
||||||
#'user-config-cuda-glibc211-i686.py',
|
'user-config-cuda-glibc211-i686.py',
|
||||||
'user-config-glibc211-i686.py']
|
'user-config-glibc211-i686.py']
|
||||||
chroot_name = 'buildbot_squeeze_i686'
|
chroot_name = 'buildbot_squeeze_i686'
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user