Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Side by Side Diff: third_party/instrumented_libraries/install-build-deps.sh

Issue 952173002: Instrumented libraries: add libjack0 to pulseaudio deps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash -e 1 #!/bin/bash -e
2 2
3 # Copyright 2014 The Chromium Authors. All rights reserved. 3 # Copyright 2014 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # Script to install build dependencies of packages which we instrument. 7 # Script to install build dependencies of packages which we instrument.
8 8
9 # Enable source repositories in Goobuntu. 9 # Enable source repositories in Goobuntu.
10 if hash goobuntu-config 2> /dev/null 10 if hash goobuntu-config 2> /dev/null
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 libsecret" 72 libsecret"
73 73
74 ubuntu_release=$(lsb_release -cs) 74 ubuntu_release=$(lsb_release -cs)
75 75
76 if test "$ubuntu_release" = "precise" ; then 76 if test "$ubuntu_release" = "precise" ; then
77 packages="$common_packages $precise_specific_packages" 77 packages="$common_packages $precise_specific_packages"
78 else 78 else
79 packages="$common_packages $trusty_specific_packages" 79 packages="$common_packages $trusty_specific_packages"
80 fi 80 fi
81 81
82 sudo apt-get build-dep -y $packages
83
84 # Extra build deps for pulseaudio, which apt-get build-dep may fail to install 82 # Extra build deps for pulseaudio, which apt-get build-dep may fail to install
85 # for reasons which are not entirely clear. 83 # for reasons which are not entirely clear.
86 sudo apt-get install libltdl3-dev libjson0-dev \ 84 sudo apt-get install libltdl3-dev libjson0-dev \
87 libsndfile1-dev libspeexdsp-dev \ 85 libsndfile1-dev libspeexdsp-dev libjack0 \
88 chrpath -y # Chrpath is required by fix_rpaths.sh. 86 chrpath -y # Chrpath is required by fix_rpaths.sh.
89 87
88 sudo apt-get build-dep -y $packages
Alexander Potapenko 2015/03/10 09:59:04 OOC, why have you put this command after the previ
89
90 if test "$ubuntu_release" = "trusty" ; then 90 if test "$ubuntu_release" = "trusty" ; then
91 # On Trusty, build deps for some of the instrumented packages above conflict 91 # On Trusty, build deps for some of the instrumented packages above conflict
92 # with Chromium's build deps. In particular: 92 # with Chromium's build deps. In particular:
93 # zlib1g and libffi remove gcc-4.8 in favor of gcc-multilib, 93 # zlib1g and libffi remove gcc-4.8 in favor of gcc-multilib,
94 # libglib2.0-0 removes libelf in favor of libelfg0. 94 # libglib2.0-0 removes libelf in favor of libelfg0.
95 # We let Chromium's build deps take priority. So, run Chromium's 95 # We let Chromium's build deps take priority. So, run Chromium's
96 # install-build-deps.sh to reinstall those that have been removed. 96 # install-build-deps.sh to reinstall those that have been removed.
97 $(dirname ${BASH_SOURCE[0]})/../../build/install-build-deps.sh --no-prompt 97 $(dirname ${BASH_SOURCE[0]})/../../build/install-build-deps.sh --no-prompt
98 fi 98 fi
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698