diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | .travis/stp.sh | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index e868493b..4daa30c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,8 +66,7 @@ before_install: ########################################################################### # Install stuff ########################################################################### - # FIXME: STP doesn't need everything from Boost! - - sudo apt-get install gcc-4.8 g++-4.8 libcap-dev cmake libboost-all-dev + - sudo apt-get install gcc-4.8 g++-4.8 libcap-dev cmake # Make gcc4.8 the default gcc version - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 20 - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 20 diff --git a/.travis/stp.sh b/.travis/stp.sh index 89d89909..d2b4f1f1 100755 --- a/.travis/stp.sh +++ b/.travis/stp.sh @@ -21,12 +21,12 @@ if [ "${STP_VERSION}" == "UPSTREAM" ]; then git clone --depth 1 git://github.com/stp/stp.git src mkdir build cd build - # Disabling building of shared libs is a workaround - cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DENABLE_PYTHON_INTERFACE:BOOL=OFF ../src - # Don't try to build stp executable, there's an issue with using gcc4.8 with boost libraries built with gcc4.6 + # Disabling building of shared libs is a workaround. + # Don't build against boost because that is broken when mixing packaged boost libraries and gcc 4.8 + cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DENABLE_PYTHON_INTERFACE:BOOL=OFF -DNO_BOOST:BOOL=ON ../src set +e # Do not exit if build fails because we need to display the log - make libstp CopyPublicHeaders >> "${STP_LOG}" 2>&1 + make >> "${STP_LOG}" 2>&1 elif [ "${STP_VERSION}" == "r940" ]; then # Building the old "r940" version that for some reason we love so much! |