Adding additional packages for nacl and naclports to install-build-deps.sh

build/install-build-deps.sh

 #!/bin/bash -e
 
 # 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.
 
 # Script to install everything needed to build chromium (well, ideally, anyway)
 # See http://code.google.com/p/chromium/wiki/LinuxBuildInstructions
 # and http://code.google.com/p/chromium/wiki/LinuxBuild64Bit
 
@@ skipping 124 matching lines @@
           libxcb1-dbg libxcomposite1-dbg libxcursor1-dbg libxdamage1-dbg
           libxdmcp6-dbg libxext6-dbg libxfixes3-dbg libxi6-dbg libxinerama1-dbg
           libxrandr2-dbg libxrender1-dbg libxtst6-dbg zlib1g-dbg
           libstdc++6-4.6-dbg"
 
 # arm cross toolchain packages needed to build chrome on armhf
 arm_list="libc6-dev-armhf-cross
           linux-libc-dev-armhf-cross
           g++-arm-linux-gnueabihf"
 
-# Packages to build standalone NaCl and all its toolchains.
-nacl_list="g++-mingw-w64-i686 libtinfo-dev:i386"
+# Packages to build NaCl, its toolchains, and its ports.
+nacl_list="bison cmake xvfb gawk texinfo autoconf libtool
+           libssl0.9.8:i386 lib32z1-dev
+           libgpm2:i386 libncurses5:i386
+           g++-mingw-w64-i686 libtinfo-dev:i386 libglib2.0-0:i386 libnss3:i386
+           libgconf-2-4:i386 libfontconfig:i386
+           libpango1.0-0:i386 libxi6:i386 libxcursor1:i386 libxcomposite1:i386
+           libasound2:i386 libxdamage1:i386 libxtst6:i386 libxrandr2:i386
+           libcap2:i386 libudev0:i386 libgtk2.0-0:i386 libxss1:i386
+           libexif12:i386 libgl1-mesa-glx:i386"

[Sam Clegg, 2014/06/02 19:26:01]

What happens when this runs on a 32-bit machine?  Or do we not even
support that anymore?

[bradn, 2014/06/02 19:38:42]

As the i386 package is then the primary one, it will usually already exist. So
should be ok.

 
 # Some package names have changed over time
 if package_exists ttf-mscorefonts-installer; then
   dev_list="${dev_list} ttf-mscorefonts-installer"
 else
   dev_list="${dev_list} msttcorefonts"
 fi
 if package_exists libnspr4-dbg; then
   dbg_list="${dbg_list} libnspr4-dbg libnss3-dbg"
   lib_list="${lib_list} libnspr4 libnss3"
@@ skipping 96 matching lines @@
 fi
 
 if test "$do_inst_arm" = "1" ; then
   echo "Including ARM cross toolchain."
 else
   echo "Skipping ARM cross toolchain."
   arm_list=
 fi
 
 if test "$do_inst_nacl" = "1"; then
-  echo "Including standalone NaCl dependencies."
+  echo "Including NaCl, NaCl toolchain, NaCl ports dependencies."
 else
-  echo "Skipping standalone NaCl dependencies."
+  echo "Skipping NaCl, NaCl toolchain, NaCl ports dependencies."
   nacl_list=
 fi
 
 packages="$(
   echo "${dev_list} ${lib_list} ${dbg_list} ${arm_list} ${nacl_list}" |
   tr " " "\n" | sort -u | tr "\n" " "
 )"
 
 if [ 1 -eq "${do_quick_check-0}" ] ; then
   failed_check="$(dpkg-query -W -f '${PackageSpec}:${Status}\n' \
@@ skipping 88 matching lines @@
     fi
     echo "It is recommended to install your repo on a local file system."
     echo "You can skip the installation of the Chrome OS default founts with"
     echo "the command line option: --no-chromeos-fonts."
     exit 1
   fi
 else
   echo "Skipping installation of Chrome OS fonts."
 fi
 
+if test "$do_inst_nacl" = "1"; then
+  echo "Installing symbolic links for NaCl."
+  if [ ! -r /usr/lib/i386-linux-gnu/libcrypto.so ]; then
+    sudo ln -fs libcrypto.so.0.9.8 /usr/lib/i386-linux-gnu/libcrypto.so
+  fi
+  if [ ! -r /usr/lib/i386-linux-gnu/libssl.so ]; then
+    sudo ln -fs libssl.so.0.9.8 /usr/lib/i386-linux-gnu/libssl.so
+  fi
+else
+  echo "Skipping symbolic links for NaCl."
+fi
+
 # Install 32bit backwards compatibility support for 64bit systems
 if file /sbin/init | grep -q 'ELF 64-bit'; then
   if test "$do_inst_lib32" != "1"
   then
     echo "NOTE: If you were expecting the option to install 32bit libs,"
     echo "please run with the --lib32 flag."
     echo
     echo "Installation complete."
     exit 0
   else
@@ skipping 192 matching lines @@
              sed -e 's/[.]so[.][0-9].*/.so/' |
              sort -u); do
     [ "x${i##*/}" = "xld-linux.so" ] && continue
     [ -r "$i" ] && continue
     j="$(ls "$i."* | sed -e 's/.*[.]so[.]\([^.]*\)$/\1/;t;d' |
          sort -n | tail -n 1)"
     [ -r "$i.$j" ] || continue
     sudo ln -s "${i##*/}.$j" "$i"
   done
 fi