Browse Source

Fix wt

- Defaults wt's boost to 1.48 as that runs on 12.04 and 14.04
- See http://packages.ubuntu.com/search?keywords=libboost-dev

Closes #1007
Hamilton Turner 11 years ago
parent
commit
27969f27a7
2 changed files with 22 additions and 11 deletions
  1. 11 11
      toolset/setup/linux/frameworks/wt.sh
  2. 11 0
      wt/bash_profile.sh

+ 11 - 11
toolset/setup/linux/frameworks/wt.sh

@@ -3,19 +3,19 @@
 RETCODE=$(fw_exists wt)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
-# TODO can this be changed based on the OS we are using? This is not
-# available on 12.04 (libboost-all-dev is available, but requires some
-# apt-get cleaning before it can be installed)
-sudo apt-get -y install libboost1.54-all-dev
+fw_get http://downloads.sourceforge.net/project/boost/boost/1.48.0/boost_1_48_0.tar.gz -O boost_1_48_0.tar.gz
+fw_untar boost_1_48_0.tar.gz
+cd boost_1_48_0
+./bootstrap.sh --prefix=$IROOT/boost
+./b2 install
+cd ..
 
-fw_get http://downloads.sourceforge.net/witty/wt-3.3.3.tar.gz -O wt.tar.gz
-fw_untar wt.tar.gz
-rm wt.tar.gz
+fw_get http://downloads.sourceforge.net/witty/wt-3.3.3.tar.gz -O wt-3.3.3.tar.gz
+fw_untar wt-3.3.3.tar.gz
 
-mv wt-* wt
-cd wt
+cd wt-3.3.3
 mkdir -p build
 cd build
-cmake .. -DWT_CPP_11_MODE=-std=c++0x -DCMAKE_BUILD_TYPE=Release
+cmake .. -DWT_CPP_11_MODE=-std=c++0x -DCMAKE_BUILD_TYPE=Release -DBOOST_PREFIX=${IROOT}/boost -DCMAKE_INSTALL_PREFIX=$IROOT/wt
 make
-sudo make install
+make install

+ 11 - 0
wt/bash_profile.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+export BOOST_ROOT=${IROOT}/boost
+export BOOST_INC=${BOOST_ROOT}/include
+export BOOST_LIB=${BOOST_ROOT}/lib
+
+export WT_ROOT=${IROOT}/wt
+export WT_LIB=${WT_ROOT}/lib
+export WT_INC=${WT_ROOT}/include
+
+export LD_LIBRARY_PATH=${BOOST_LIB}:${WT_LIB}:$LD_LIBRARY_PATH