Split linux library expectations for debian into 32 and 64 bit, remove libgcc1 from 64 after clang …

chrome/installer/linux/debian/build.sh

 #!/bin/bash
 #
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # TODO(mmoss) This currently only works with official builds, since non-official
 # builds don't add the "${BUILDDIR}/installer/" files needed for packaging.
 
 set -e
@@ skipping 257 matching lines @@
   LD_LIBRARY_PATH=$SAVE_LDLP
 fi
 
 # Format it nicely and save it for comparison.
 # The grep -v is for a duplicate libc6 dep caused by Lucid glibc silliness.
 echo "$DPKG_SHLIB_DEPS" | sed 's/, /\n/g' | \
   grep -v '^libc6 (>= 2.3.6-6~)$' > actual
 
 # 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"

[Lei Zhang, 2014/07/10 18:07:42]

maybe just expected_deps_$TARGETARCH here?

[Nico, 2014/07/10 18:08:29]

Dunno, this is what the rpm script does. Seems like a good idea to keep them
similar?

+  echo "chrome/installer/linux/debian/expected_deps_x64"
   echo
   exit $BAD_DIFF
 fi
 rm -rf "$DUMMY_STAGING_DIR"
 
 # Additional dependencies not in the dpkg-shlibdeps output.
 # Pull a more recent version of NSS than required by runtime linking, for
 # security and stability updates in NSS.
 ADDITION_DEPS="ca-certificates, libappindicator1, libcurl3, \
   libnss3 (>= 3.14.3), lsb-base (>=3.2), xdg-utils (>= 1.0.2), wget"
@@ skipping 28 matching lines @@
     ;;
   * )
     echo
     echo "ERROR: Don't know how to build DEBs for '$TARGETARCH'."
     echo
     exit 1
     ;;
 esac
 
 do_package