fixed Ubuntu 12 build script dependencies

Summary: added missed boost dependency and changed CMake build order

Reviewed By: snarkmaster, yfeldblum

Differential Revision: D2878880

fb-gh-sync-id: 2a5cded97afde4fd0d741168c3296f2c71426374

diff --git a/folly/build/deps_ubuntu_12.04.sh b/folly/build/deps_ubuntu_12.04.sh
index 4e3e7d23783d010582965dfd91d05ed794f68049..3b185f8dea9712bf75c0954d98d96736bcfe9021 100755 (executable)
--- a/folly/build/deps_ubuntu_12.04.sh
+++ b/folly/build/deps_ubuntu_12.04.sh
@@ -22,9 +22,10 @@ sudo add-apt-repository -y ppa:boost-latest/ppa
 sudo apt-get update
 
 sudo apt-get install -y git gcc-4.8 g++-4.8 libboost1.54-dev autoconf git \
-  libboost-thread1.54-dev libboost-filesystem1.54-dev libssl-dev cmake \
+  libboost-thread1.54-dev libboost-filesystem1.54-dev libssl-dev \
   libsnappy-dev libboost-system1.54-dev libboost-regex1.54-dev make \
-  libboost-context1.54-dev libtool libevent-dev libgtest-dev binutils-dev
+  libboost-context1.54-dev libtool libevent-dev libgtest-dev binutils-dev \
+  libboost-program-options1.54-dev
 
 # TODO: According to the folly docs, these system dependencies might be
 # missing.  However, things seem to build fine...
@@ -37,22 +38,14 @@ sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
 CMAKE_NAME=cmake-2.8.12.1
 GFLAGS_VER=2.1.1
 GLOG_NAME=glog-0.3.3
-
-# double-conversion
-pushd .
-git clone https://github.com/google/double-conversion
-cd double-conversion
-cmake -DBUILD_SHARED_LIBS=ON .  # Don't use scons instead, it's broken.
-make
-sudo make install
-sudo ldconfig
-popd
+DC_VER=1.1.5
+DC_NAME=double-conversion-${DC_VER}
 
 # Newer cmake, since the system's 2.8.7 cmake is too old for gflags:
 # https://groups.google.com/forum/#!topic/google-gflags/bu1iIDKn-ok
 pushd .
-wget http://www.cmake.org/files/v2.8/${CMAKE_NAME}.tar.gz \
-  -O ${CMAKE_NAME}.tar.gz
+wget --no-check-certificate http://www.cmake.org/files/v2.8/${CMAKE_NAME}.tar.gz \
+    -O ${CMAKE_NAME}.tar.gz
 tar xzf ${CMAKE_NAME}.tar.gz
 cd ${CMAKE_NAME}
 cmake .
@@ -60,6 +53,18 @@ make
 CMAKE="$(readlink -f bin/cmake)"
 popd
 
+# double-conversion
+pushd .
+wget https://github.com/google/double-conversion/archive/v${DC_VER}.tar.gz \
+    -O ${DC_NAME}.tar.gz
+tar xzf ${DC_NAME}.tar.gz
+cd ${DC_NAME}
+"$CMAKE" -DBUILD_SHARED_LIBS=ON .  # Don't use scons instead, it's broken.
+make
+sudo make install
+sudo ldconfig
+popd
+
 # gflags
 pushd .
 wget https://github.com/gflags/gflags/archive/v${GFLAGS_VER}.tar.gz \