From 50f7328fb6067cf5bf922c00a585886f9e992728 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 10 Feb 2013 20:47:44 +0000 Subject: Fix scons win32 link error with OSL, also fix a GLEW linker warning --- build_files/scons/config/win32-vc-config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_files') diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index 21488e75f7e..95352bda8a7 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -182,7 +182,7 @@ WITH_BF_STATICOCIO = True WITH_BF_BOOST = True BF_BOOST = '${LIBDIR}/boost' BF_BOOST_INC = '${BF_BOOST}/include' -BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49 libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49 libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49' +BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49 libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49 libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49 libboost_wave-vc90-mt-s-1_49' BF_BOOST_LIB_INTERNATIONAL = 'libboost_locale-vc90-mt-s-1_49' BF_BOOST_LIBPATH = '${BF_BOOST}/lib' -- cgit v1.2.3 From 6888d6eac828689b8a9fb96f5b4f80f45be8301a Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 11 Feb 2013 13:39:22 +0000 Subject: Buildbot: switch to using native toolkit again Crosscompiling of cubins doesn't work on linux with toolkit 4.2, so use native toolkit for now. Disabled sm_13 for 32bit platform for now. Would keep cudakernels build target for a while. It doesn't hurt being in the code and it could be helpful again once we'll switch to toolkit 5.x where crosscompilation works fine. Some further tweaks could probably be needed still, let's see how building goes on buildbot now :) --- build_files/buildbot/config/user-config-glibc211-i686.py | 4 +++- build_files/buildbot/config/user-config-glibc211-x86_64.py | 3 ++- build_files/buildbot/slave_compile.py | 4 ++-- 3 files changed, 7 insertions(+), 4 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 540416ee1fb..b2dcd40bff0 100644 --- a/build_files/buildbot/config/user-config-glibc211-i686.py +++ b/build_files/buildbot/config/user-config-glibc211-i686.py @@ -110,7 +110,9 @@ BF_JACK_LIB_STATIC = '${BF_ZLIB}/lib/libjack.a' # Cycles WITH_BF_CYCLES = True -WITH_BF_CYCLES_CUDA_BINARIES = False +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_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 c0ba8060712..edd9500d88d 100644 --- a/build_files/buildbot/config/user-config-glibc211-x86_64.py +++ b/build_files/buildbot/config/user-config-glibc211-x86_64.py @@ -110,7 +110,8 @@ BF_JACK_LIB_STATIC = '${BF_ZLIB}/lib/libjack.a' # Cycles WITH_BF_CYCLES = True -WITH_BF_CYCLES_CUDA_BINARIES = False +WITH_BF_CYCLES_CUDA_BINARIES = True +BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30'] 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 dab8a8e6483..ae9a84ab22c 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 From eb723ad5554359fca8974fc33ac45b4a66ac3f30 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 11 Feb 2013 13:44:18 +0000 Subject: Buildbot: -WITHOUT_BF_OVERWRITE_INSTALL should not be needed now --- build_files/buildbot/config/user-config-glibc211-i686.py | 1 - build_files/buildbot/config/user-config-glibc211-x86_64.py | 1 - 2 files changed, 2 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 b2dcd40bff0..97c55cafbe9 100644 --- a/build_files/buildbot/config/user-config-glibc211-i686.py +++ b/build_files/buildbot/config/user-config-glibc211-i686.py @@ -1,7 +1,6 @@ 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' 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 edd9500d88d..1d43670b31d 100644 --- a/build_files/buildbot/config/user-config-glibc211-x86_64.py +++ b/build_files/buildbot/config/user-config-glibc211-x86_64.py @@ -1,7 +1,6 @@ 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' -- cgit v1.2.3 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