Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-10-29 19:31:48 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-10-29 19:31:48 +0400
commit37801c86f24ea62f7d3e68b2ec1f4a24fa6f225a (patch)
tree051da70111728c59d13a3b53426a44a37be5c89b /build_files/buildbot
parent36127e1255396776fab9d9abdf9bc5f8ba14c81a (diff)
Buildbot: tweaks for glibc2.11 build environment
Diffstat (limited to 'build_files/buildbot')
-rw-r--r--build_files/buildbot/slave_compile.py6
-rw-r--r--build_files/buildbot/slave_pack.py6
2 files changed, 12 insertions, 0 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 3d8679d6f74..bedada93a5a 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -81,6 +81,12 @@ else:
elif builder.endswith('linux_glibc27_i386_scons'):
configs = ['user-config-player-glibc27-i686.py',
'user-config-glibc27-i686.py']
+ if builder.endswith('linux_glibc211_x86_64_scons'):
+ configs = ['user-config-player-glibc211-x86_64.py',
+ 'user-config-glibc211-x86_64.py']
+ elif builder.endswith('linux_glibc211_i386_scons'):
+ configs = ['user-config-player-glibc211-i686.py',
+ 'user-config-glibc211-i686.py']
for config in configs:
config_fpath = os.path.join(config_dir, config)
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index f8d59b5a609..b7775ef872f 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -63,6 +63,12 @@ if builder.find('scons') != -1:
elif builder.endswith('linux_glibc27_i386_scons'):
config = 'user-config-glibc27-i686.py'
bits = 32
+ if builder.endswith('linux_glibc211_x86_64_scons'):
+ config = 'user-config-glibc211-x86_64.py'
+ bits = 64
+ elif builder.endswith('linux_glibc211_i386_scons'):
+ config = 'user-config-glibc211-i686.py'
+ bits = 32
if config is not None:
config_fpath = os.path.join(config_dir, config)