diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-10 18:12:21 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-10 18:12:21 +0000 |
| commit | 2a430054bb9fd6ff60b7bb3e487cb6eff3a073f4 (patch) | |
| tree | 20727ea1aab18ce07f8435eb17b1ee5ae51c5db9 /chrome/installer | |
| parent | 8799651e239b9985740b6402291cbe3af88668bc (diff) | |
| download | chromium_src-2a430054bb9fd6ff60b7bb3e487cb6eff3a073f4.zip chromium_src-2a430054bb9fd6ff60b7bb3e487cb6eff3a073f4.tar.gz chromium_src-2a430054bb9fd6ff60b7bb3e487cb6eff3a073f4.tar.bz2 | |
Split linux library expectations for debian into 32 and 64 bit, remove libgcc1 from 64 after clang switch
BUG=360311
NOTRY=true
Review URL: https://codereview.chromium.org/385693002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282379 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rwxr-xr-x | chrome/installer/linux/debian/build.sh | 5 | ||||
| -rw-r--r-- | chrome/installer/linux/debian/expected_deps_ia32 (renamed from chrome/installer/linux/debian/expected_deps) | 0 | ||||
| -rw-r--r-- | chrome/installer/linux/debian/expected_deps_x64 | 30 |
3 files changed, 33 insertions, 2 deletions
diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh index 9431844..9f5c02c 100755 --- a/chrome/installer/linux/debian/build.sh +++ b/chrome/installer/linux/debian/build.sh @@ -275,12 +275,13 @@ echo "$DPKG_SHLIB_DEPS" | sed 's/, /\n/g' | \ # Compare the expected dependency list to the generate list. BAD_DIFF=0 -diff "$SCRIPTDIR/expected_deps" actual || BAD_DIFF=1 +diff "$SCRIPTDIR/expected_deps_$TARGETARCH" actual || BAD_DIFF=1 if [ $BAD_DIFF -ne 0 ] && [ -z "${IGNORE_DEPS_CHANGES:-}" ]; then echo echo "ERROR: Shared library dependencies changed!" echo "If this is intentional, please update:" - echo "chrome/installer/linux/debian/expected_deps" + echo "chrome/installer/linux/debian/expected_deps_ia32" + echo "chrome/installer/linux/debian/expected_deps_x64" echo exit $BAD_DIFF fi diff --git a/chrome/installer/linux/debian/expected_deps b/chrome/installer/linux/debian/expected_deps_ia32 index ec92bc9..ec92bc9 100644 --- a/chrome/installer/linux/debian/expected_deps +++ b/chrome/installer/linux/debian/expected_deps_ia32 diff --git a/chrome/installer/linux/debian/expected_deps_x64 b/chrome/installer/linux/debian/expected_deps_x64 new file mode 100644 index 0000000..b0d25f0 --- /dev/null +++ b/chrome/installer/linux/debian/expected_deps_x64 @@ -0,0 +1,30 @@ +gconf-service +libasound2 (>= 1.0.23) +libc6 (>= 2.11) +libcairo2 (>= 1.6.0) +libcap2 (>= 2.10) +libcups2 (>= 1.4.0) +libdbus-1-3 (>= 1.2.14) +libexpat1 (>= 1.95.8) +libfontconfig1 (>= 2.8.0) +libfreetype6 (>= 2.3.9) +libgconf-2-4 (>= 2.31.1) +libgdk-pixbuf2.0-0 (>= 2.22.0) +libglib2.0-0 (>= 2.28.0) +libgtk2.0-0 (>= 2.24.0) +libnspr4 (>= 1.8.0.10) +libnss3 (>= 3.14.3) +libpango1.0-0 (>= 1.22.0) +libstdc++6 (>= 4.6) +libudev0 (>= 147) +libx11-6 (>= 2:1.4.99.1) +libxcomposite1 (>= 1:0.3-1) +libxcursor1 (>> 1.1.2) +libxdamage1 (>= 1:1.1) +libxext6 +libxfixes3 (>= 1:5.0) +libxi6 (>= 2:1.2.99.4) +libxrandr2 (>= 2:1.2.99.2) +libxrender1 +libxss1 +libxtst6 |