diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-10 16:06:30 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-10 16:06:30 +0000 |
| commit | 2544aa33b72199cb1b28bcd6fa05c1280489689f (patch) | |
| tree | f3306cbbd852b9987747325c0d66f8e07b0f3eb1 /chrome/installer | |
| parent | 17880945064718d9c5c4ba239ae0b7e9531589e4 (diff) | |
| download | chromium_src-2544aa33b72199cb1b28bcd6fa05c1280489689f.zip chromium_src-2544aa33b72199cb1b28bcd6fa05c1280489689f.tar.gz chromium_src-2544aa33b72199cb1b28bcd6fa05c1280489689f.tar.bz2 | |
More flailing around for official library deps.
This reverts https://codereview.chromium.org/387513002/ which was wrong, and
applies something like https://codereview.chromium.org/376403002/ to the
64bit rpm expectations.
BUG=360311
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/382773005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282338 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/linux/debian/expected_deps | 1 | ||||
| -rw-r--r-- | chrome/installer/linux/rpm/expected_deps_i386 | 1 | ||||
| -rw-r--r-- | chrome/installer/linux/rpm/expected_deps_x86_64 | 5 |
3 files changed, 1 insertions, 6 deletions
diff --git a/chrome/installer/linux/debian/expected_deps b/chrome/installer/linux/debian/expected_deps index b0d25f0..ec92bc9 100644 --- a/chrome/installer/linux/debian/expected_deps +++ b/chrome/installer/linux/debian/expected_deps @@ -8,6 +8,7 @@ libdbus-1-3 (>= 1.2.14) libexpat1 (>= 1.95.8) libfontconfig1 (>= 2.8.0) libfreetype6 (>= 2.3.9) +libgcc1 (>= 1:4.1.1) libgconf-2-4 (>= 2.31.1) libgdk-pixbuf2.0-0 (>= 2.22.0) libglib2.0-0 (>= 2.28.0) diff --git a/chrome/installer/linux/rpm/expected_deps_i386 b/chrome/installer/linux/rpm/expected_deps_i386 index 7b73552..8d05e4d 100644 --- a/chrome/installer/linux/rpm/expected_deps_i386 +++ b/chrome/installer/linux/rpm/expected_deps_i386 @@ -26,7 +26,6 @@ libdl.so.2(GLIBC_2.1) libexpat.so.1 libfontconfig.so.1 libfreetype.so.6 -libgcc1 (>= 1:4.1.1) libgcc_s.so.1 libgcc_s.so.1(GCC_3.0) libgcc_s.so.1(GLIBC_2.0) diff --git a/chrome/installer/linux/rpm/expected_deps_x86_64 b/chrome/installer/linux/rpm/expected_deps_x86_64 index e5b5397..c96cfc1 100644 --- a/chrome/installer/linux/rpm/expected_deps_x86_64 +++ b/chrome/installer/linux/rpm/expected_deps_x86_64 @@ -13,7 +13,6 @@ libc.so.6(GLIBC_2.3)(64bit) libc.so.6(GLIBC_2.4)(64bit) libc.so.6(GLIBC_2.6)(64bit) libc.so.6(GLIBC_2.7)(64bit) -libc.so.6(GLIBC_2.8)(64bit) libc.so.6(GLIBC_2.9)(64bit) libcups.so.2()(64bit) libdbus-1.so.3()(64bit) @@ -22,9 +21,6 @@ libdl.so.2(GLIBC_2.2.5)(64bit) libexpat.so.1()(64bit) libfontconfig.so.1()(64bit) libfreetype.so.6()(64bit) -libgcc_s.so.1()(64bit) -libgcc_s.so.1(GCC_3.4)(64bit) -libgcc_s.so.1(GCC_4.0.0)(64bit) libgconf-2.so.4()(64bit) libgdk_pixbuf-2.0.so.0()(64bit) libgdk-x11-2.0.so.0()(64bit) @@ -51,7 +47,6 @@ libstdc++.so.6()(64bit) libstdc++.so.6(GLIBCXX_3.4.10)(64bit) libstdc++.so.6(GLIBCXX_3.4.11)(64bit) libstdc++.so.6(GLIBCXX_3.4.15)(64bit) -libstdc++.so.6(GLIBCXX_3.4.5)(64bit) libstdc++.so.6(GLIBCXX_3.4)(64bit) libstdc++.so.6(GLIBCXX_3.4.9)(64bit) libX11.so.6()(64bit) |