[Bf-blender-cvs] [0b14bab] buildbot_linux_cmake: Buildbot: Some cleanup to minimize difference against master

[Sergey Sharybin]

Commit: 0b14bab4a17635a901fe874b2312f8262ba202f4
Author: Sergey Sharybin
Date:   Wed Dec 2 16:25:47 2015 +0500
Branches: buildbot_linux_cmake
https://developer.blender.org/rB0b14bab4a17635a901fe874b2312f8262ba202f4

Buildbot: Some cleanup to minimize difference against master

===================================================================

M	build_files/buildbot/config/blender_linux.cmake
M	build_files/buildbot/slave_compile.py

===================================================================

diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake
index 046a942..e888966 100644
--- a/build_files/buildbot/config/blender_linux.cmake
+++ b/build_files/buildbot/config/blender_linux.cmake
@@ -4,7 +4,6 @@ include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_full.cmake")
 
 # ######## Linux-specific build options ########
 # Options which are specific to Linux-only platforms
-set(WITH_CYCLES_OSL          ON  CACHE BOOL "" FORCE)
 set(WITH_DOC_MANPAGE         OFF CACHE BOOL "" FORCE)
 
 # ######## Official release-specific build options ########
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 25db927..d055822 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -138,7 +138,7 @@ if 'cmake' in builder:
         elif 'win64' in builder:
             command = ['msbuild', 'INSTALL.vcxproj', '/p:Configuration=Release']
         else:
-            command = chroot_prefix + ['make', '-s', '-j16', 'install']
+            command = chroot_prefix + ['make', '-s', '-j2', 'install']
 
         print("Executing command:")
         print(command)