From de6a69fc793dfa3162489bd04c981b11ac3005c2 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 24 Sep 2014 16:32:36 +0600 Subject: Fix T41936: lender 2.72 Crashes on play on *Ubuntu 14.04 This commit is necessary to update to openal-soft 1.60.0 which solves weird bug happening on ubuntu. This is to be landed to the release branch. --- build_files/buildbot/config/user-config-glibc211-i686.py | 2 +- build_files/buildbot/config/user-config-glibc211-x86_64.py | 2 +- build_files/buildbot/config/user-config-player-glibc211-i686.py | 2 +- build_files/buildbot/config/user-config-player-glibc211-x86_64.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build_files/buildbot/config/user-config-glibc211-i686.py b/build_files/buildbot/config/user-config-glibc211-i686.py index d7a1439e003..0971735f641 100644 --- a/build_files/buildbot/config/user-config-glibc211-i686.py +++ b/build_files/buildbot/config/user-config-glibc211-i686.py @@ -49,7 +49,7 @@ BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.7.1/libstdc++.a' WITH_BF_OPENAL = True WITH_BF_STATICOPENAL = True BF_OPENAL = '/opt/lib/openal' -BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a' +BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a' WITH_BF_GETTEXT_STATIC = 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 f07c447bf29..748d1004850 100644 --- a/build_files/buildbot/config/user-config-glibc211-x86_64.py +++ b/build_files/buildbot/config/user-config-glibc211-x86_64.py @@ -49,7 +49,7 @@ BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.7.1/libstdc++.a' WITH_BF_OPENAL = True WITH_BF_STATICOPENAL = True BF_OPENAL = '/opt/lib/openal' -BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a' +BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a' WITH_BF_GETTEXT_STATIC = True diff --git a/build_files/buildbot/config/user-config-player-glibc211-i686.py b/build_files/buildbot/config/user-config-player-glibc211-i686.py index 641dbe082ad..384da4070eb 100644 --- a/build_files/buildbot/config/user-config-player-glibc211-i686.py +++ b/build_files/buildbot/config/user-config-player-glibc211-i686.py @@ -34,7 +34,7 @@ BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.7.1/libstdc++.a' WITH_BF_OPENAL = True WITH_BF_STATICOPENAL = True BF_OPENAL = '/opt/lib/openal' -BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a' +BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a' WITH_BF_GETTEXT_STATIC = True diff --git a/build_files/buildbot/config/user-config-player-glibc211-x86_64.py b/build_files/buildbot/config/user-config-player-glibc211-x86_64.py index 80503268b44..5176d59d5a0 100644 --- a/build_files/buildbot/config/user-config-player-glibc211-x86_64.py +++ b/build_files/buildbot/config/user-config-player-glibc211-x86_64.py @@ -34,7 +34,7 @@ BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.7.1/libstdc++.a' WITH_BF_OPENAL = True WITH_BF_STATICOPENAL = True BF_OPENAL = '/opt/lib/openal' -BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a' +BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a' WITH_BF_GETTEXT_STATIC = True -- cgit v1.2.3