diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-02 23:10:03 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-02 23:10:03 +0000 |
| commit | 713eac6708cdadc256d996e6695a4ee9d09212d8 (patch) | |
| tree | 71ba6b454b896dd1c575ad262e9432e0c0a1aad3 /build | |
| parent | 5f5842e5bce725dc68e000e4a5599b9a2d5a2a82 (diff) | |
| download | chromium_src-713eac6708cdadc256d996e6695a4ee9d09212d8.zip chromium_src-713eac6708cdadc256d996e6695a4ee9d09212d8.tar.gz chromium_src-713eac6708cdadc256d996e6695a4ee9d09212d8.tar.bz2 | |
Adding additional packages for nacl and naclports to install-build-deps.sh
Adds about 40MB.
BUG=None
TEST=local
R=sbc@chromium.org, hinoka@chromium.org
Review URL: https://codereview.chromium.org/302083016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/install-build-deps.sh | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh index 6684596..f0f0877 100755 --- a/build/install-build-deps.sh +++ b/build/install-build-deps.sh @@ -142,8 +142,17 @@ 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 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 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" # Some package names have changed over time if package_exists ttf-mscorefonts-installer; then @@ -260,9 +269,9 @@ else 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 @@ -371,6 +380,18 @@ 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" |