| commit | e158b0ebe8ba891c971dd2f3fbddfccd696af119 | [log] [tgz] |
|---|---|---|
| author | Tom Anderson <thomasanderson@chromium.org> | Wed Aug 02 18:54:23 2017 |
| committer | Thomas Anderson <thomasanderson@chromium.org> | Wed Aug 02 18:54:23 2017 |
| tree | cdb759abce900ded036ac5a55cd0e795328e0451 | |
| parent | 4fc2252e12036209627c848f18352acb0932f6a0 [diff] |
Relax glibc dependency to 2.17 on M61 This CL is a merge of "Roll buildtools to d511e4" [1], and a selective merge of "Relax glibc requirement to 2.17" [2] (only the expected_deps* files). [1] https://chromium.googlesource.com/chromium/src.git/+/d12900b02e627d4d6af55c93b731e8ac6d5ee906 [2] https://chromium.googlesource.com/chromium/src.git/+/c2e32f4639a6c56eef7fc4f65160ac2896eca0f1 BUG=749077 TBR=thestig@chromium.org NOPRESUBMIT=true NOTRY=true NOTREECHECKS=true Change-Id: I8d2aa785b1db4011815c91c5e7d34d9ea89157b9 Reviewed-on: https://chromium-review.googlesource.com/598631 Reviewed-by: Thomas Anderson <thomasanderson@chromium.org> Cr-Commit-Position: refs/branch-heads/3163@{#243} Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
diff --git a/DEPS b/DEPS index 39f1f83..223075a 100644 --- a/DEPS +++ b/DEPS
@@ -56,7 +56,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling build tools # and whatever else without interference from each other. - 'buildtools_revision': '5ad14542a6a74dd914f067b948c5d3e8d170396b', + 'buildtools_revision': 'd511e4d53d6fc8037badbdf4b225c137e94b52fb', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling SwiftShader # and whatever else without interference from each other.
diff --git a/chrome/installer/linux/debian/expected_deps_x64_jessie b/chrome/installer/linux/debian/expected_deps_x64_jessie index dcaaa2e..2315179a3 100644 --- a/chrome/installer/linux/debian/expected_deps_x64_jessie +++ b/chrome/installer/linux/debian/expected_deps_x64_jessie
@@ -1,7 +1,7 @@ gconf-service libasound2 (>= 1.0.16) libatk1.0-0 (>= 1.12.4) -libc6 (>= 2.18) +libc6 (>= 2.17) libcairo2 (>= 1.6.0) libcups2 (>= 1.4.0) libdbus-1-3 (>= 1.2.14)
diff --git a/chrome/installer/linux/rpm/expected_deps_x86_64 b/chrome/installer/linux/rpm/expected_deps_x86_64 index cdb4117..fe6ca3e 100644 --- a/chrome/installer/linux/rpm/expected_deps_x86_64 +++ b/chrome/installer/linux/rpm/expected_deps_x86_64
@@ -19,7 +19,6 @@ libc.so.6(GLIBC_2.14)(64bit) libc.so.6(GLIBC_2.15)(64bit) libc.so.6(GLIBC_2.17)(64bit) -libc.so.6(GLIBC_2.18)(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3)(64bit) libc.so.6(GLIBC_2.3.2)(64bit)