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

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

Issue 1049833003: Fix dependency issue with install-build-deps.sh on Trusty (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 (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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 fi 148 fi
149 149
150 # 32-bit libraries needed e.g. to compile V8 snapshot for Android or armhf 150 # 32-bit libraries needed e.g. to compile V8 snapshot for Android or armhf
151 lib32_list="linux-libc-dev:i386" 151 lib32_list="linux-libc-dev:i386"
152 152
153 # arm cross toolchain packages needed to build chrome on armhf 153 # arm cross toolchain packages needed to build chrome on armhf
154 arm_list="libc6-dev-armhf-cross 154 arm_list="libc6-dev-armhf-cross
155 linux-libc-dev-armhf-cross 155 linux-libc-dev-armhf-cross
156 g++-arm-linux-gnueabihf" 156 g++-arm-linux-gnueabihf"
157 157
158 # Work around for dependency issue Ubuntu/Trusty: http://crbug.com/435056
159 if [ "x$lsb_release" = "xtrusty" ]; then
160 arm_list+=" g++-4.8-multilib-arm-linux-gnueabihf
161 gcc-4.8-multilib-arm-linux-gnueabihf"
162 fi
163
158 # Packages to build NaCl, its toolchains, and its ports. 164 # Packages to build NaCl, its toolchains, and its ports.
159 naclports_list="ant autoconf bison cmake gawk intltool xutils-dev xsltproc" 165 naclports_list="ant autoconf bison cmake gawk intltool xutils-dev xsltproc"
160 nacl_list="g++-mingw-w64-i686 lib32z1-dev 166 nacl_list="g++-mingw-w64-i686 lib32z1-dev
161 libasound2:i386 libcap2:i386 libelf-dev:i386 libexif12:i386 167 libasound2:i386 libcap2:i386 libelf-dev:i386 libexif12:i386
162 libfontconfig1:i386 libgconf-2-4:i386 libglib2.0-0:i386 libgpm2:i386 168 libfontconfig1:i386 libgconf-2-4:i386 libglib2.0-0:i386 libgpm2:i386
163 libgtk2.0-0:i386 libncurses5:i386 lib32ncurses5-dev 169 libgtk2.0-0:i386 libncurses5:i386 lib32ncurses5-dev
164 libnss3:i386 libpango1.0-0:i386 170 libnss3:i386 libpango1.0-0:i386
165 libssl1.0.0:i386 libtinfo-dev libtinfo-dev:i386 libtool 171 libssl1.0.0:i386 libtinfo-dev libtinfo-dev:i386 libtool
166 libxcomposite1:i386 libxcursor1:i386 libxdamage1:i386 libxi6:i386 172 libxcomposite1:i386 libxcursor1:i386 libxdamage1:i386 libxi6:i386
167 libxrandr2:i386 libxss1:i386 libxtst6:i386 texinfo xvfb 173 libxrandr2:i386 libxss1:i386 libxtst6:i386 texinfo xvfb
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 # only contains libcrypto.so.1.0.0 and not the symlink needed for 452 # only contains libcrypto.so.1.0.0 and not the symlink needed for
447 # linking (libcrypto.so). 453 # linking (libcrypto.so).
448 create_library_symlink /lib/i386-linux-gnu/libcrypto.so.1.0.0 \ 454 create_library_symlink /lib/i386-linux-gnu/libcrypto.so.1.0.0 \
449 /usr/lib/i386-linux-gnu/libcrypto.so 455 /usr/lib/i386-linux-gnu/libcrypto.so
450 456
451 create_library_symlink /lib/i386-linux-gnu/libssl.so.1.0.0 \ 457 create_library_symlink /lib/i386-linux-gnu/libssl.so.1.0.0 \
452 /usr/lib/i386-linux-gnu/libssl.so 458 /usr/lib/i386-linux-gnu/libssl.so
453 else 459 else
454 echo "Skipping symbolic links for NaCl." 460 echo "Skipping symbolic links for NaCl."
455 fi 461 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