Commit5410c5f

committed

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

This reverts commit10874f3.

1 parented355f0 commit5410c5fCopy full SHA for 5410c5f

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ cd build`
`6`	`6`	`cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \`
`7`	`7`	`-DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS \`
`8`	`8`	`-DCPP-NETLIB_ENABLE_HTTPS=$ENABLE_HTTPS \`
	`9`	`+ -DBOOST_INCLUDEDIR="${HOME}/${CC}-boost_${BOOST_VERSION}/include" \`
	`10`	`+ -DBOOST_LIBRARYDIR="${HOME}/${CC}-boost_${BOOST_VERSION}/lib" \`
`9`	`11`	`-DCMAKE_CXX_FLAGS="-std=c++11${CMAKE_CXX_FLAGS}" \`
`10`	`12`	`..`
`11`	`13`	`make -j2`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,13 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`	`set -e`
`3`	`3`
`4`		`-if [!-d"${BOOST_ROOT}" ];then`
	`4`	`+if [!-d"${HOME}/${CC}-boost_${BOOST_VERSION}/include" ];then`
`5`	`5`	`wget -O boost_${BOOST_VERSION}.tar.bz2 http://sourceforge.net/projects/boost/files/boost/${BOOST_VER}/boost_${BOOST_VERSION}.tar.bz2/download`
`6`	`6`	`tar jxf boost_${BOOST_VERSION}.tar.bz2`
	`7`	`+cd boost_${BOOST_VERSION}`
	`8`	`+ ./bootstrap.sh --with-toolset=$TOOLSET --prefix=${HOME}/${CC}-boost_${BOOST_VERSION}`
	`9`	`+ ./b2 --stagedir=. -j4 --layout=tagged variant=debug,release link=shared threading=multi address-model=64 cxxflags='-std=c++11' install>boost-build.log2>&1`
	`10`	`+cd ..`
	`11`	`+ rm -rf boost_${BOOST_VERSION}`
	`12`	`+ rm -rf boost_${BOOST_VERSION}.tar.bz2`
`7`	`13`	`fi`

Comments

(0)