Reland of Switch Chrome on Linux to libc++

chrome/installer/linux/rpm/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 72 matching lines @@
   # we use is too old and doesn't provide %{_isa}, so we do this manually.
   if [ "$ARCHITECTURE" = "x86_64" ] ; then
     local EMPTY_VERSION="()"
     local PKG_ARCH="(64bit)"
   elif [ "$ARCHITECTURE" = "i386" ] ; then
     local EMPTY_VERSION=""
     local PKG_ARCH=""
   fi
 
   # Use find-requires script to make sure the dependencies are complete
-  # (especially libc and libstdc++ versions).
+  # (especially libc versions).
   DETECTED_DEPENDS="$(echo "${BUILDDIR}/chrome" | /usr/lib/rpm/find-requires)"
 
   # Compare the expected dependency list to the generated list.
   #
   # In this comparison, we allow ld-linux.so's symbol version "GLIBC_2.3"
   # to be present but don't require it, because it is hard to predict
   # whether it will be generated.  Referencing a __thread
   # (thread-local/TLS) variable *sometimes* causes the compiler to generate
   # a reference to __tls_get_addr() (depending on compiler options such as
   # -fPIC vs. -fPIE).  This function has symbol version "GLIBC_2.3".  The
@@ skipping 16 matching lines @@
     exit $BAD_DIFF
   fi
 
   # lsb implies many dependencies.
   #
   # nss (bundled) is optional in LSB 4.0. Also specify a more recent version
   # for security and stability updates. While we depend on libnss3.so and not
   # libssl3.so, force the dependency on libssl3 to ensure the NSS version is
   # 3.28 or later, since libssl3 should always be packaged with libnss3.
   #
-  # libstdc++.so.6 is for C++11 support.
-  #
   # wget is for uploading crash reports with Breakpad.
   #
   # xdg-utils is still optional in LSB 4.0.
   #
   # zlib may not need to be there. It should be included with LSB.
   # TODO(thestig): Figure out why there is an entry for zlib.
   #
   # We want to depend on the system SSL certs so wget can upload crash reports
   # securely, but there's no common capability between the distros. Bugs filed:
   # https://qa.mandriva.com/show_bug.cgi?id=55714
   # https://bugzilla.redhat.com/show_bug.cgi?id=538158
   # https://bugzilla.novell.com/show_bug.cgi?id=556248
   #
   # We want to depend on liberation-fonts as well, but there is no such package
   # for Fedora. https://bugzilla.redhat.com/show_bug.cgi?id=1252564
   # TODO(thestig): Use the liberation-fonts package once its available on all
   # supported distros.
   DEPENDS="lsb >= 4.0, \
   libnss3.so(NSS_3.22)${PKG_ARCH}, \
   libssl3.so(NSS_3.28)${PKG_ARCH}, \
-  libstdc++.so.6(GLIBCXX_3.4.18)${PKG_ARCH}, \
   wget, \
   xdg-utils, \
   zlib, \
   $(echo "${DETECTED_DEPENDS}" | tr '\n' ',')"
   gen_spec
 
   # Create temporary rpmbuild dirs.
   RPMBUILD_DIR=$(mktemp -d -t rpmbuild.XXXXXX) || exit 1
   mkdir -p "$RPMBUILD_DIR/BUILD"
   mkdir -p "$RPMBUILD_DIR/RPMS"
@@ skipping 160 matching lines @@
     ;;
   * )
     echo
     echo "ERROR: Don't know how to build RPMs for '$TARGETARCH'."
     echo
     exit 1
     ;;
 esac
 
 do_package