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

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

Issue 1003853003: Fix installation of libgl1-mesa-dev and mesa-common-dev in install-build-deps.sh (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 95
96 # Packages needed for chromeos only 96 # Packages needed for chromeos only
97 chromeos_dev_list="libbluetooth-dev libxkbcommon-dev" 97 chromeos_dev_list="libbluetooth-dev libxkbcommon-dev"
98 98
99 # Packages needed for development 99 # Packages needed for development
100 dev_list="apache2.2-bin bison cdbs curl dpkg-dev elfutils devscripts fakeroot 100 dev_list="apache2.2-bin bison cdbs curl dpkg-dev elfutils devscripts fakeroot
101 flex fonts-thai-tlwg g++ git-core git-svn gperf language-pack-da 101 flex fonts-thai-tlwg g++ git-core git-svn gperf language-pack-da
102 language-pack-fr language-pack-he language-pack-zh-hant 102 language-pack-fr language-pack-he language-pack-zh-hant
103 libapache2-mod-php5 libasound2-dev libbrlapi-dev libav-tools 103 libapache2-mod-php5 libasound2-dev libbrlapi-dev libav-tools
104 libbz2-dev libcairo2-dev libcap-dev libcups2-dev libcurl4-gnutls-dev 104 libbz2-dev libcairo2-dev libcap-dev libcups2-dev libcurl4-gnutls-dev
105 libdrm-dev libelf-dev libexif-dev libgconf2-dev libgl1-mesa-dev 105 libdrm-dev libelf-dev libexif-dev libgconf2-dev libglib2.0-dev
106 libglib2.0-dev libglu1-mesa-dev libgnome-keyring-dev libgtk2.0-dev 106 libglu1-mesa-dev libgnome-keyring-dev libgtk2.0-dev libkrb5-dev
107 libkrb5-dev libnspr4-dev libnss3-dev libpam0g-dev libpci-dev 107 libnspr4-dev libnss3-dev libpam0g-dev libpci-dev libpulse-dev
108 libpulse-dev libsctp-dev libspeechd-dev libsqlite3-dev libssl-dev 108 libsctp-dev libspeechd-dev libsqlite3-dev libssl-dev libudev-dev
109 libudev-dev libwww-perl libxslt1-dev libxss-dev libxt-dev libxtst-dev 109 libwww-perl libxslt1-dev libxss-dev libxt-dev libxtst-dev openbox
110 mesa-common-dev openbox patch perl php5-cgi pkg-config python 110 patch perl php5-cgi pkg-config python python-cherrypy3 python-crypto
111 python-cherrypy3 python-crypto python-dev python-numpy python-opencv 111 python-dev python-numpy python-opencv python-openssl python-psutil
112 python-openssl python-psutil rpm ruby subversion ttf-dejavu-core 112 rpm ruby subversion ttf-dejavu-core ttf-indic-fonts ttf-kochi-gothic
113 ttf-indic-fonts ttf-kochi-gothic ttf-kochi-mincho wdiff xfonts-mathml 113 ttf-kochi-mincho wdiff xfonts-mathml zip $chromeos_dev_list"
114 zip $chromeos_dev_list"
115 114
116 # 64-bit systems need a minimum set of 32-bit compat packages for the pre-built 115 # 64-bit systems need a minimum set of 32-bit compat packages for the pre-built
117 # NaCl binaries. 116 # NaCl binaries.
118 if file /sbin/init | grep -q 'ELF 64-bit'; then 117 if file /sbin/init | grep -q 'ELF 64-bit'; then
119 dev_list="${dev_list} libc6-i386 lib32gcc1 lib32stdc++6" 118 dev_list="${dev_list} libc6-i386 lib32gcc1 lib32stdc++6"
120 fi 119 fi
121 120
122 # Run-time libraries required by chromeos only 121 # Run-time libraries required by chromeos only
123 chromeos_lib_list="libpulse0 libbz2-1.0" 122 chromeos_lib_list="libpulse0 libbz2-1.0"
124 123
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 libnss3:i386 libpango1.0-0:i386 156 libnss3:i386 libpango1.0-0:i386
158 libssl1.0.0:i386 libtinfo-dev libtinfo-dev:i386 libtool 157 libssl1.0.0:i386 libtinfo-dev libtinfo-dev:i386 libtool
159 libxcomposite1:i386 libxcursor1:i386 libxdamage1:i386 libxi6:i386 158 libxcomposite1:i386 libxcursor1:i386 libxdamage1:i386 libxi6:i386
160 libxrandr2:i386 libxss1:i386 libxtst6:i386 texinfo xvfb 159 libxrandr2:i386 libxss1:i386 libxtst6:i386 texinfo xvfb
161 ${naclports_list}" 160 ${naclports_list}"
162 161
163 # Find the proper version of libgbm-dev. We can't just install libgbm-dev as 162 # Find the proper version of libgbm-dev. We can't just install libgbm-dev as
164 # it depends on mesa, and only one version of mesa can exists on the system. 163 # it depends on mesa, and only one version of mesa can exists on the system.
165 # Hence we must match the same version or this entire script will fail. 164 # Hence we must match the same version or this entire script will fail.
166 mesa_variant="" 165 mesa_variant=""
167 for variant in "-lts-quantal" "-lts-raring" "-lts-saucy" "-lts-trusty"; do 166 for variant in "-lts-quantal" "-lts-raring" "-lts-saucy" "-lts-trusty" \
167 "-lts-utopic"; do
168 if $(dpkg-query -Wf'${Status}' libgl1-mesa-glx${variant} 2>/dev/null | \ 168 if $(dpkg-query -Wf'${Status}' libgl1-mesa-glx${variant} 2>/dev/null | \
169 grep -q " ok installed"); then 169 grep -q " ok installed"); then
170 mesa_variant="${variant}" 170 mesa_variant="${variant}"
171 fi 171 fi
172 done 172 done
173 dev_list="${dev_list} libgbm-dev${mesa_variant} 173 dev_list="${dev_list} libgbm-dev${mesa_variant}
174 libgles2-mesa-dev${mesa_variant}" 174 libgles2-mesa-dev${mesa_variant} libgl1-mesa-dev${mesa_variant}
175 mesa-common-dev${mesa_variant}"
175 nacl_list="${nacl_list} libgl1-mesa-glx${mesa_variant}:i386" 176 nacl_list="${nacl_list} libgl1-mesa-glx${mesa_variant}:i386"
176 177
177 # Some package names have changed over time 178 # Some package names have changed over time
178 if package_exists ttf-mscorefonts-installer; then 179 if package_exists ttf-mscorefonts-installer; then
179 dev_list="${dev_list} ttf-mscorefonts-installer" 180 dev_list="${dev_list} ttf-mscorefonts-installer"
180 else 181 else
181 dev_list="${dev_list} msttcorefonts" 182 dev_list="${dev_list} msttcorefonts"
182 fi 183 fi
183 if package_exists libnspr4-dbg; then 184 if package_exists libnspr4-dbg; then
184 dbg_list="${dbg_list} libnspr4-dbg libnss3-dbg" 185 dbg_list="${dbg_list} libnspr4-dbg libnss3-dbg"
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 # only contains libcrypto.so.1.0.0 and not the symlink needed for 439 # only contains libcrypto.so.1.0.0 and not the symlink needed for
439 # linking (libcrypto.so). 440 # linking (libcrypto.so).
440 create_library_symlink /lib/i386-linux-gnu/libcrypto.so.1.0.0 \ 441 create_library_symlink /lib/i386-linux-gnu/libcrypto.so.1.0.0 \
441 /usr/lib/i386-linux-gnu/libcrypto.so 442 /usr/lib/i386-linux-gnu/libcrypto.so
442 443
443 create_library_symlink /lib/i386-linux-gnu/libssl.so.1.0.0 \ 444 create_library_symlink /lib/i386-linux-gnu/libssl.so.1.0.0 \
444 /usr/lib/i386-linux-gnu/libssl.so 445 /usr/lib/i386-linux-gnu/libssl.so
445 else 446 else
446 echo "Skipping symbolic links for NaCl." 447 echo "Skipping symbolic links for NaCl."
447 fi 448 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