diff options
| author | earthdok <earthdok@chromium.org> | 2014-12-10 12:51:16 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-10 20:52:34 +0000 |
| commit | 6e3b64e60809293d1775ed89abf19134ead4163a (patch) | |
| tree | 70cff75ecafe2ca44ee093c1b863c901feed1d97 /third_party/instrumented_libraries/instrumented_libraries.gyp | |
| parent | 7a57d713af7774c4a6fe5ce10ba3585072b2c97b (diff) | |
| download | chromium_src-6e3b64e60809293d1775ed89abf19134ead4163a.zip chromium_src-6e3b64e60809293d1775ed89abf19134ead4163a.tar.gz chromium_src-6e3b64e60809293d1775ed89abf19134ead4163a.tar.bz2 | |
Instrumented libraries: attempt to fix a deadlock in libxcb1.
Backport a fix for an issue that looks related.
BUG=440063
TBR=glider@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/796553002
Cr-Commit-Position: refs/heads/master@{#307755}
Diffstat (limited to 'third_party/instrumented_libraries/instrumented_libraries.gyp')
| -rw-r--r-- | third_party/instrumented_libraries/instrumented_libraries.gyp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp index 339565e..195ce30 100644 --- a/third_party/instrumented_libraries/instrumented_libraries.gyp +++ b/third_party/instrumented_libraries/instrumented_libraries.gyp @@ -321,6 +321,12 @@ 'package_name': 'libxcb1', 'dependencies=': [], 'extra_configure_flags': ['--disable-build-docs'], + 'conditions': [ + ['"<(_ubuntu_release)"=="precise"', { + # Backport fix for https://bugs.freedesktop.org/show_bug.cgi?id=54671 + 'patch': 'patches/libxcb1.precise.diff', + }], + ], # Required on Trusty due to autoconf version mismatch. 'run_before_build': 'scripts/autoreconf.sh', 'includes': ['standard_instrumented_package_target.gypi'], |