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

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

Issue 1300613002: Fix a detection of 64-bit architecture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use --derenefernce option Created 5 years, 4 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 libsctp-dev libspeechd-dev libsqlite3-dev libssl-dev libudev-dev 108 libsctp-dev libspeechd-dev libsqlite3-dev libssl-dev libudev-dev
109 libwww-perl libxslt1-dev libxss-dev libxt-dev libxtst-dev openbox 109 libwww-perl libxslt1-dev libxss-dev libxt-dev libxtst-dev openbox
110 patch perl php5-cgi pkg-config python python-cherrypy3 python-crypto 110 patch perl php5-cgi pkg-config python python-cherrypy3 python-crypto
111 python-dev python-numpy python-opencv python-openssl python-psutil 111 python-dev python-numpy python-opencv python-openssl python-psutil
112 python-yaml rpm ruby subversion ttf-dejavu-core ttf-indic-fonts 112 python-yaml rpm ruby subversion ttf-dejavu-core ttf-indic-fonts
113 ttf-kochi-gothic ttf-kochi-mincho wdiff xfonts-mathml zip 113 ttf-kochi-gothic ttf-kochi-mincho wdiff xfonts-mathml zip
114 $chromeos_dev_list" 114 $chromeos_dev_list"
115 115
116 # 64-bit systems need a minimum set of 32-bit compat packages for the pre-built 116 # 64-bit systems need a minimum set of 32-bit compat packages for the pre-built
117 # NaCl binaries. 117 # NaCl binaries.
118 if file /sbin/init | grep -q 'ELF 64-bit'; then 118 if file -L /sbin/init | grep -q 'ELF 64-bit'; then
119 dev_list="${dev_list} libc6-i386 lib32gcc1 lib32stdc++6" 119 dev_list="${dev_list} libc6-i386 lib32gcc1 lib32stdc++6"
120 fi 120 fi
121 121
122 # Run-time libraries required by chromeos only 122 # Run-time libraries required by chromeos only
123 chromeos_lib_list="libpulse0 libbz2-1.0" 123 chromeos_lib_list="libpulse0 libbz2-1.0"
124 124
125 # Full list of required run-time libraries 125 # Full list of required run-time libraries
126 lib_list="libatk1.0-0 libc6 libasound2 libcairo2 libcap2 libcups2 libexpat1 126 lib_list="libatk1.0-0 libc6 libasound2 libcairo2 libcap2 libcups2 libexpat1
127 libexif12 libfontconfig1 libfreetype6 libglib2.0-0 libgnome-keyring0 127 libexif12 libfontconfig1 libfreetype6 libglib2.0-0 libgnome-keyring0
128 libgtk2.0-0 libpam0g libpango1.0-0 libpci3 libpcre3 libpixman-1-0 128 libgtk2.0-0 libpam0g libpango1.0-0 libpci3 libpcre3 libpixman-1-0
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 223
224 # Some packages are only needed if the distribution actually supports 224 # Some packages are only needed if the distribution actually supports
225 # installing them. 225 # installing them.
226 if package_exists appmenu-gtk; then 226 if package_exists appmenu-gtk; then
227 lib_list="$lib_list appmenu-gtk" 227 lib_list="$lib_list appmenu-gtk"
228 fi 228 fi
229 229
230 # When cross building for arm/Android on 64-bit systems the host binaries 230 # When cross building for arm/Android on 64-bit systems the host binaries
231 # that are part of v8 need to be compiled with -m32 which means 231 # that are part of v8 need to be compiled with -m32 which means
232 # that basic multilib support is needed. 232 # that basic multilib support is needed.
233 if file /sbin/init | grep -q 'ELF 64-bit'; then 233 if file -L /sbin/init | grep -q 'ELF 64-bit'; then
234 # gcc-multilib conflicts with the arm cross compiler (at least in trusty) but 234 # gcc-multilib conflicts with the arm cross compiler (at least in trusty) but
235 # g++-X.Y-multilib gives us the 32-bit support that we need. Find out the 235 # g++-X.Y-multilib gives us the 32-bit support that we need. Find out the
236 # appropriate value of X and Y by seeing what version the current 236 # appropriate value of X and Y by seeing what version the current
237 # distribution's g++-multilib package depends on. 237 # distribution's g++-multilib package depends on.
238 multilib_package=$(apt-cache depends g++-multilib --important | \ 238 multilib_package=$(apt-cache depends g++-multilib --important | \
239 grep -E --color=never --only-matching '\bg\+\+-[0-9.]+-multilib\b') 239 grep -E --color=never --only-matching '\bg\+\+-[0-9.]+-multilib\b')
240 lib32_list="$lib32_list $multilib_package" 240 lib32_list="$lib32_list $multilib_package"
241 fi 241 fi
242 242
243 # Waits for the user to press 'Y' or 'N'. Either uppercase of lowercase is 243 # Waits for the user to press 'Y' or 'N'. Either uppercase of lowercase is
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 # only contains libcrypto.so.1.0.0 and not the symlink needed for 453 # only contains libcrypto.so.1.0.0 and not the symlink needed for
454 # linking (libcrypto.so). 454 # linking (libcrypto.so).
455 create_library_symlink /lib/i386-linux-gnu/libcrypto.so.1.0.0 \ 455 create_library_symlink /lib/i386-linux-gnu/libcrypto.so.1.0.0 \
456 /usr/lib/i386-linux-gnu/libcrypto.so 456 /usr/lib/i386-linux-gnu/libcrypto.so
457 457
458 create_library_symlink /lib/i386-linux-gnu/libssl.so.1.0.0 \ 458 create_library_symlink /lib/i386-linux-gnu/libssl.so.1.0.0 \
459 /usr/lib/i386-linux-gnu/libssl.so 459 /usr/lib/i386-linux-gnu/libssl.so
460 else 460 else
461 echo "Skipping symbolic links for NaCl." 461 echo "Skipping symbolic links for NaCl."
462 fi 462 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