diff options
| author | earthdok <earthdok@chromium.org> | 2014-11-14 05:16:49 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-14 13:17:59 +0000 |
| commit | a619ed5714a751b218c27ecc359c9684cd278bc3 (patch) | |
| tree | 30f17838a0a24500fe5f69c213cdad716eb9d56a /third_party/instrumented_libraries | |
| parent | 2addba63eae0035d210f72fba23a18672ff93892 (diff) | |
| download | chromium_src-a619ed5714a751b218c27ecc359c9684cd278bc3.zip chromium_src-a619ed5714a751b218c27ecc359c9684cd278bc3.tar.gz chromium_src-a619ed5714a751b218c27ecc359c9684cd278bc3.tar.bz2 | |
Instrumented libraries: fix install-build-deps.sh on Trusty.
BUG=414189
TBR=glider@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/718413003
Cr-Commit-Position: refs/heads/master@{#304204}
Diffstat (limited to 'third_party/instrumented_libraries')
| -rwxr-xr-x | third_party/instrumented_libraries/install-build-deps.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/third_party/instrumented_libraries/install-build-deps.sh b/third_party/instrumented_libraries/install-build-deps.sh index 90e837a..f4f54c8 100755 --- a/third_party/instrumented_libraries/install-build-deps.sh +++ b/third_party/instrumented_libraries/install-build-deps.sh @@ -72,7 +72,6 @@ else packages="$common_packages $trusty_specific_packages" fi -echo $packages sudo apt-get build-dep -y $packages # Extra build deps for pulseaudio, which apt-get build-dep may fail to install @@ -80,3 +79,13 @@ sudo apt-get build-dep -y $packages sudo apt-get install libltdl3-dev libjson0-dev \ libsndfile1-dev libspeexdsp-dev \ chrpath -y # Chrpath is required by fix_rpaths.sh. + +if test "$ubuntu_release" = "trusty" ; then + # On Trusty, build deps for some of the instrumented packages above conflict + # with Chromium's build deps. In particular: + # zlib1g and libffi remove gcc-4.8 in favor of gcc-multilib, + # libglib2.0-0 removes libelf in favor of libelfg0. + # We let Chromium's build deps take priority. So, run Chromium's + # install-build-deps.sh to reinstall those that have been removed. + $(dirname ${BASH_SOURCE[0]})/../../build/install-build-deps.sh --no-prompt +fi |