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

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

Issue 695373002: Suppress stderr on mesa package detection in install_build_deps.sh (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 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 everything needed to build chromium (well, ideally, anyway) 7 # Script to install everything needed to build chromium (well, ideally, anyway)
8 # See http://code.google.com/p/chromium/wiki/LinuxBuildInstructions 8 # See http://code.google.com/p/chromium/wiki/LinuxBuildInstructions
9 # and http://code.google.com/p/chromium/wiki/LinuxBuild64Bit 9 # and http://code.google.com/p/chromium/wiki/LinuxBuild64Bit
10 10
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 libssl0.9.8:i386 libtinfo-dev libtinfo-dev:i386 libtool 153 libssl0.9.8:i386 libtinfo-dev libtinfo-dev:i386 libtool
154 libxcomposite1:i386 libxcursor1:i386 libxdamage1:i386 libxi6:i386 154 libxcomposite1:i386 libxcursor1:i386 libxdamage1:i386 libxi6:i386
155 libxrandr2:i386 libxss1:i386 libxtst6:i386 texinfo xvfb 155 libxrandr2:i386 libxss1:i386 libxtst6:i386 texinfo xvfb
156 ${naclports_list}" 156 ${naclports_list}"
157 157
158 # Find the proper version of libgbm-dev. We can't just install libgbm-dev as 158 # Find the proper version of libgbm-dev. We can't just install libgbm-dev as
159 # it depends on mesa, and only one version of mesa can exists on the system. 159 # it depends on mesa, and only one version of mesa can exists on the system.
160 # Hence we must match the same version or this entire script will fail. 160 # Hence we must match the same version or this entire script will fail.
161 mesa_variant="" 161 mesa_variant=""
162 for variant in "-lts-quantal" "-lts-raring" "-lts-saucy" "-lts-trusty"; do 162 for variant in "-lts-quantal" "-lts-raring" "-lts-saucy" "-lts-trusty"; do
163 if $(dpkg-query -Wf'${Status}' libgl1-mesa-glx${variant} | \ 163 if $(dpkg-query -Wf'${Status}' libgl1-mesa-glx${variant} 2>/dev/null | \
164 grep -q " ok installed"); then 164 grep -q " ok installed"); then
165 mesa_variant="${variant}" 165 mesa_variant="${variant}"
166 fi 166 fi
167 done 167 done
168 dev_list="${dev_list} libgbm-dev${mesa_variant} 168 dev_list="${dev_list} libgbm-dev${mesa_variant}
169 libgles2-mesa-dev${mesa_variant}" 169 libgles2-mesa-dev${mesa_variant}"
170 nacl_list="${nacl_list} libgl1-mesa-glx${mesa_variant}:i386" 170 nacl_list="${nacl_list} libgl1-mesa-glx${mesa_variant}:i386"
171 171
172 # Some package names have changed over time 172 # Some package names have changed over time
173 if package_exists ttf-mscorefonts-installer; then 173 if package_exists ttf-mscorefonts-installer; then
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 echo "Installing symbolic links for NaCl." 401 echo "Installing symbolic links for NaCl."
402 if [ ! -r /usr/lib/i386-linux-gnu/libcrypto.so ]; then 402 if [ ! -r /usr/lib/i386-linux-gnu/libcrypto.so ]; then
403 sudo ln -fs libcrypto.so.0.9.8 /usr/lib/i386-linux-gnu/libcrypto.so 403 sudo ln -fs libcrypto.so.0.9.8 /usr/lib/i386-linux-gnu/libcrypto.so
404 fi 404 fi
405 if [ ! -r /usr/lib/i386-linux-gnu/libssl.so ]; then 405 if [ ! -r /usr/lib/i386-linux-gnu/libssl.so ]; then
406 sudo ln -fs libssl.so.0.9.8 /usr/lib/i386-linux-gnu/libssl.so 406 sudo ln -fs libssl.so.0.9.8 /usr/lib/i386-linux-gnu/libssl.so
407 fi 407 fi
408 else 408 else
409 echo "Skipping symbolic links for NaCl." 409 echo "Skipping symbolic links for NaCl."
410 fi 410 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