diff options
| author | markus@chromium.org <markus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 22:09:41 +0000 |
|---|---|---|
| committer | markus@chromium.org <markus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 22:09:41 +0000 |
| commit | b11411c46daf81c38c40b69da5be45c74ee4dd78 (patch) | |
| tree | 3d91857d5743016b117dce587a8d517750761d03 /build/install-build-deps.sh | |
| parent | d603ca97812db754aeaff4e672e374a8c71f210d (diff) | |
| download | chromium_src-b11411c46daf81c38c40b69da5be45c74ee4dd78.zip chromium_src-b11411c46daf81c38c40b69da5be45c74ee4dd78.tar.gz chromium_src-b11411c46daf81c38c40b69da5be45c74ee4dd78.tar.bz2 | |
Fixed a few more minor nitpicks:
- "apt-cache show" is more appropriate for us then
"dpkg --print-avail"
- the test that was supposed to find the correct name for
the nspr and nss libraries didn't work correctly for
distributions (e.g. natty) that for a transition period
included both versions of the library. The new test has
been verified to work with natty.
- it is annoying that the "--clean" option sometimes fails
with a hard-to-understand error message. We now always
use "sudo" to avoid confusing users.
- apart from dbus, some distributions apparently also keep
rsyslogd running after installing the build dependencies.
If this keeps popping up as a problem, we might have to
eventually device a more generic solution.
- when the user told us to remove an old install, try to
remove all traces, instead of just the parts that cost
a lot of disk space.
BUG=none
TEST=verify that we can install natty32bit (with debug symbols) and that afterwards Chrome can be built.
Review URL: https://chromiumcodereview.appspot.com/9764004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/install-build-deps.sh')
| -rwxr-xr-x | build/install-build-deps.sh | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh index cf01ff7..917c7b6 100755 --- a/build/install-build-deps.sh +++ b/build/install-build-deps.sh @@ -56,7 +56,7 @@ dev_list="apache2.2-bin bison curl elfutils fakeroot flex g++ gperf language-pack-fr libapache2-mod-php5 libasound2-dev libbz2-dev libcairo2-dev libcups2-dev libcurl4-gnutls-dev libdbus-glib-1-dev libelf-dev libgconf2-dev libgl1-mesa-dev libglib2.0-dev - libglu1-mesa-dev libgnome-keyring-dev libgtk2.0-dev libjpeg62-dev + libglu1-mesa-dev libgnome-keyring-dev libgtk2.0-dev libkrb5-dev libnspr4-dev libnss3-dev libpam0g-dev libsctp-dev libsqlite3-dev libssl-dev libudev-dev libwww-perl libxslt1-dev libxss-dev libxt-dev libxtst-dev mesa-common-dev patch @@ -91,22 +91,27 @@ dbg_list="libatk1.0-dbg libc6-dbg libcairo2-dbg libdbus-glib-1-2-dbg plugin_list="flashplugin-installer" # Some package names have changed over time -if dpkg --print-avail msttcorefonts >/dev/null 2>&1; then - dev_list="${dev_list} msttcorefonts" -else +if apt-cache show ttf-mscorefonts-installer >/dev/null 2>&1; then dev_list="${dev_list} ttf-mscorefonts-installer" +else + dev_list="${dev_list} msttcorefonts" fi -if dpkg --print-avail libnspr4 >/dev/null 2>&1; then +if apt-cache show libnspr4-dbg >/dev/null 2>&1; then dbg_list="${dbg_list} libnspr4-dbg libnss3-dbg" lib_list="${lib_list} libnspr4 libnss3" else dbg_list="${dbg_list} libnspr4-0d-dbg libnss3-1d-dbg" lib_list="${lib_list} libnspr4-0d libnss3-1d" fi +if apt-cache show libjpeg-dev >/dev/null 2>&1; then + dev_list="${dev_list} libjpeg-dev" +else + dev_list="${dev_list} libjpeg62-dev" +fi # Some packages are only needed, if the distribution actually supports # installing them. -if dpkg --print-avail appmenu-gtk >/dev/null 2>&1; then +if apt-cache show appmenu-gtk >/dev/null 2>&1; then lib_list="$lib_list appmenu-gtk" fi |