Add libssl1.0.0:386 to install-build-deps.sh for naclports

build/install-build-deps.sh

Index: build/install-build-deps.sh
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh
index cded4529c41be1d28447396e4531afe878f05d4b..d4cec508e542e13139d67967b8048779bdbd4210 100755
--- a/build/install-build-deps.sh
+++ b/build/install-build-deps.sh
@@ -155,7 +155,7 @@ nacl_list="g++-mingw-w64-i686 lib32z1-dev
            libfontconfig1:i386 libgconf-2-4:i386 libglib2.0-0:i386 libgpm2:i386
            libgtk2.0-0:i386 libncurses5:i386 lib32ncurses5-dev
            libnss3:i386 libpango1.0-0:i386
-           libssl0.9.8:i386 libtinfo-dev libtinfo-dev:i386 libtool
+           libssl1.0.0:i386 libtinfo-dev libtinfo-dev:i386 libtool
            libxcomposite1:i386 libxcursor1:i386 libxdamage1:i386 libxi6:i386
            libxrandr2:i386 libxss1:i386 libxtst6:i386 texinfo xvfb
            ${naclports_list}"
@@ -418,11 +418,29 @@ 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
+  # naclports needs to cross build python for i386, but libssl1.0.0:i386
+  # only contains libcypto.so.1.0.0 and not the symlink needed for
+  # linking (libcypto.so).
+  target=/lib/i386-linux-gnu/libcypto.so.1.0.0

[scottmg, 2015/02/13 06:39:59]

"crypto" or "cypto"?

[Sam Clegg, 2015/02/13 17:23:17]

Ouch.  Thanks.  Done.

+  linkname=/usr/lib/i386-linux-gnu/libcrypto.so
+  if [ -L $linkname ]; then
+    if [ "$(basename $(readlink $linkname))" != "$(basename $target)" ]; then
+      sudo rm $linkname
+    fi
+  fi
+  if [ ! -r $linkname ]; then
+    sudo ln -fs $target $linkname
+  fi
+
+  target=/lib/i386-linux-gnu/libssl.so.1.0.0
+  linkname=/usr/lib/i386-linux-gnu/libssl.so
+  if [ -L $linkname ]; then
+    if [ "$(basename $(readlink $linkname))" != "$(basename $target)" ]; then
+      sudo rm $linkname
+    fi
   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
+  if [ ! -r $linkname ]; then
+    sudo ln -fs $target $linkname
   fi
 else
   echo "Skipping symbolic links for NaCl."