summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authormdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-07 22:34:40 +0000
committermdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-07 22:34:40 +0000
commitce940f01fdcd216b90e5005f840d3df5d19190cd (patch)
tree9a5959a613550bf99d87b9a5767ee0888684df7f /build
parentecc5f3bb16218947cc3c50fa01730a83b8c309b0 (diff)
downloadchromium_src-ce940f01fdcd216b90e5005f840d3df5d19190cd.zip
chromium_src-ce940f01fdcd216b90e5005f840d3df5d19190cd.tar.gz
chromium_src-ce940f01fdcd216b90e5005f840d3df5d19190cd.tar.bz2
Linux: add gnome-keyring packages to build dependencies. It will not be a runtime dependency: it will be dlopen()ed to avoid that.
BUG=25404 TEST=none Review URL: http://codereview.chromium.org/2700002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49110 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rwxr-xr-xbuild/install-build-deps.sh18
1 files changed, 9 insertions, 9 deletions
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh
index eddd37f..601bd9b 100755
--- a/build/install-build-deps.sh
+++ b/build/install-build-deps.sh
@@ -140,20 +140,20 @@ chromeos_dev_list="libpulse-dev"
dev_list="apache2 bison fakeroot flex g++ gperf libapache2-mod-php5
libasound2-dev libbz2-dev libcairo2-dev libdbus-glib-1-dev
libgconf2-dev libgl1-mesa-dev libglu1-mesa-dev libglib2.0-dev
- libgtk2.0-dev libjpeg62-dev libnspr4-dev libnss3-dev libpam0g-dev
- libsqlite3-dev libxslt1-dev libxss-dev lighttpd mesa-common-dev
- msttcorefonts patch perl php5-cgi pkg-config python python-dev rpm
- subversion ttf-dejavu-core ttf-kochi-gothic ttf-kochi-mincho wdiff
- libcurl4-gnutls-dev $chromeos_dev_list"
+ libgnome-keyring-dev libgtk2.0-dev libjpeg62-dev libnspr4-dev
+ libnss3-dev libpam0g-dev libsqlite3-dev libxslt1-dev libxss-dev
+ lighttpd mesa-common-dev msttcorefonts patch perl php5-cgi pkg-config
+ python python-dev rpm subversion ttf-dejavu-core ttf-kochi-gothic
+ ttf-kochi-mincho wdiff libcurl4-gnutls-dev $chromeos_dev_list"
# Run-time libraries required by chromeos only
chromeos_lib_list="libpulse0"
# Full list of required run-time libraries
lib_list="libatk1.0-0 libc6 libasound2 libcairo2 libdbus-glib-1-2 libexpat1
- libfontconfig1 libfreetype6 libglib2.0-0 libgtk2.0-0 libnspr4-0d
- libnss3-1d libpango1.0-0 libpcre3 libpixman-1-0 libpng12-0 libstdc++6
- libsqlite3-0 libx11-6 libxau6 libxcb1 libxcomposite1
+ libfontconfig1 libfreetype6 libglib2.0-0 libgnome-keyring0 libgtk2.0-0
+ libnspr4-0d libnss3-1d libpango1.0-0 libpcre3 libpixman-1-0 libpng12-0
+ libstdc++6 libsqlite3-0 libx11-6 libxau6 libxcb1 libxcomposite1
libxcursor1 libxdamage1 libxdmcp6 libxext6 libxfixes3 libxi6
libxinerama1 libxrandr2 libxrender1 zlib1g $chromeos_lib_list"
@@ -166,7 +166,7 @@ dbg_list="libatk1.0-dbg libc6-dbg libcairo2-dbg
libxfixes3-dbg libxi6-dbg libxinerama1-dbg libxrandr2-dbg
libxrender1-dbg zlib1g-dbg"
-# CUPS package changed it's name from hardy to the next version. Include
+# CUPS package changed its name from hardy to the next version. Include
# proper package here depending on the system.
if egrep -q 'Ubuntu (8\.04|8\.10)' /etc/issue; then
dev_list="${dev_list} libcupsys2-dev"