Revert "Updated build scripts so that we don't build boost."

deanberris · deanberris · commit 5410c5fb8f5d · 2016-02-09T00:21:12.000+11:00
This reverts commit 10874f3.
diff --git a/build.sh b/build.sh
@@ -6,6 +6,8 @@ cd build
 cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
   -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS \
   -DCPP-NETLIB_ENABLE_HTTPS=$ENABLE_HTTPS \
+  -DBOOST_INCLUDEDIR="${HOME}/${CC}-boost_${BOOST_VERSION}/include" \
+  -DBOOST_LIBRARYDIR="${HOME}/${CC}-boost_${BOOST_VERSION}/lib" \
   -DCMAKE_CXX_FLAGS="-std=c++11 ${CMAKE_CXX_FLAGS}" \
   ..
 make -j2
diff --git a/install-boost.sh b/install-boost.sh
@@ -1,7 +1,13 @@
 #!/bin/sh
 set -e
 
-if [ ! -d "${BOOST_ROOT}" ]; then
+if [ ! -d "${HOME}/${CC}-boost_${BOOST_VERSION}/include" ]; then
   wget -O boost_${BOOST_VERSION}.tar.bz2 http://sourceforge.net/projects/boost/files/boost/${BOOST_VER}/boost_${BOOST_VERSION}.tar.bz2/download
   tar jxf boost_${BOOST_VERSION}.tar.bz2
+  cd boost_${BOOST_VERSION}
+  ./bootstrap.sh --with-toolset=$TOOLSET --prefix=${HOME}/${CC}-boost_${BOOST_VERSION}
+  ./b2 --stagedir=. -j4 --layout=tagged variant=debug,release link=shared threading=multi address-model=64 cxxflags='-std=c++11' install >boost-build.log 2>&1 
+  cd ..
+  rm -rf boost_${BOOST_VERSION}
+  rm -rf boost_${BOOST_VERSION}.tar.bz2
 fi
