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

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

Issue 10825369: Only install the 32-bit compat packages on 64-bit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
« 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 language-pack-fr libapache2-mod-php5 libasound2-dev libbz2-dev 60 language-pack-fr libapache2-mod-php5 libasound2-dev libbz2-dev
61 libcairo2-dev libcups2-dev libcurl4-gnutls-dev libdbus-glib-1-dev 61 libcairo2-dev libcups2-dev libcurl4-gnutls-dev libdbus-glib-1-dev
62 libelf-dev libgconf2-dev libgl1-mesa-dev libglib2.0-dev 62 libelf-dev libgconf2-dev libgl1-mesa-dev libglib2.0-dev
63 libglu1-mesa-dev libgnome-keyring-dev libgtk2.0-dev 63 libglu1-mesa-dev libgnome-keyring-dev libgtk2.0-dev
64 libkrb5-dev libnspr4-dev libnss3-dev libpam0g-dev libsctp-dev 64 libkrb5-dev libnspr4-dev libnss3-dev libpam0g-dev libsctp-dev
65 libsqlite3-dev libssl-dev libudev-dev libwww-perl libxslt1-dev 65 libsqlite3-dev libssl-dev libudev-dev libwww-perl libxslt1-dev
66 libxss-dev libxt-dev libxtst-dev mesa-common-dev patch 66 libxss-dev libxt-dev libxtst-dev mesa-common-dev patch
67 perl php5-cgi pkg-config python python-cherrypy3 python-dev 67 perl php5-cgi pkg-config python python-cherrypy3 python-dev
68 python-psutil rpm ruby subversion ttf-dejavu-core ttf-indic-fonts 68 python-psutil rpm ruby subversion ttf-dejavu-core ttf-indic-fonts
69 ttf-kochi-gothic ttf-kochi-mincho ttf-thai-tlwg wdiff git-core 69 ttf-kochi-gothic ttf-kochi-mincho ttf-thai-tlwg wdiff git-core
70 libc6-i386 lib32gcc1
71 $chromeos_dev_list" 70 $chromeos_dev_list"
72 71
72 # 64-bit systems need a minimum set of 32-bit compat packages for the pre-built
73 # NaCL binaries. These are always needed, regardless of whether or not we want
74 # the full 32-bit "cross-compile" support (--lib32).
75 if [ "$(uname -m)" = "x86_64" ]; then
76 dev_list="${dev_list} libc6-i386 lib32gcc1"
77 fi
78
73 # Run-time libraries required by chromeos only 79 # Run-time libraries required by chromeos only
74 chromeos_lib_list="libpulse0 libbz2-1.0 libcurl4-gnutls-dev" 80 chromeos_lib_list="libpulse0 libbz2-1.0 libcurl4-gnutls-dev"
75 81
76 # Full list of required run-time libraries 82 # Full list of required run-time libraries
77 lib_list="libatk1.0-0 libc6 libasound2 libcairo2 libcups2 libdbus-glib-1-2 83 lib_list="libatk1.0-0 libc6 libasound2 libcairo2 libcups2 libdbus-glib-1-2
78 libexpat1 libfontconfig1 libfreetype6 libglib2.0-0 libgnome-keyring0 84 libexpat1 libfontconfig1 libfreetype6 libglib2.0-0 libgnome-keyring0
79 libgtk2.0-0 libpam0g libpango1.0-0 libpcre3 libpixman-1-0 85 libgtk2.0-0 libpam0g libpango1.0-0 libpcre3 libpixman-1-0
80 libpng12-0 libstdc++6 libsqlite3-0 libudev0 libx11-6 libxau6 libxcb1 86 libpng12-0 libstdc++6 libsqlite3-0 libudev0 libx11-6 libxau6 libxcb1
81 libxcomposite1 libxcursor1 libxdamage1 libxdmcp6 libxext6 libxfixes3 87 libxcomposite1 libxcursor1 libxdamage1 libxdmcp6 libxext6 libxfixes3
82 libxi6 libxinerama1 libxrandr2 libxrender1 libxtst6 zlib1g 88 libxi6 libxinerama1 libxrandr2 libxrender1 libxtst6 zlib1g
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 sed -e 's/[.]so[.][0-9].*/.so/' | 405 sed -e 's/[.]so[.][0-9].*/.so/' |
400 sort -u); do 406 sort -u); do
401 [ "x${i##*/}" = "xld-linux.so" ] && continue 407 [ "x${i##*/}" = "xld-linux.so" ] && continue
402 [ -r "$i" ] && continue 408 [ -r "$i" ] && continue
403 j="$(ls "$i."* | sed -e 's/.*[.]so[.]\([^.]*\)$/\1/;t;d' | 409 j="$(ls "$i."* | sed -e 's/.*[.]so[.]\([^.]*\)$/\1/;t;d' |
404 sort -n | tail -n 1)" 410 sort -n | tail -n 1)"
405 [ -r "$i.$j" ] || continue 411 [ -r "$i.$j" ] || continue
406 sudo ln -s "${i##*/}.$j" "$i" 412 sudo ln -s "${i##*/}.$j" "$i"
407 done 413 done
408 fi 414 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