diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-02-02 19:43:59 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-02-02 19:43:59 (GMT) |
| commit | 18e3a7d9ad8e052d626ac250a9c9d5f36f29a54d (patch) | |
| tree | 565c87e051833daa1c0eed7ffe45533fcf05c2fb /scripts | |
| parent | 61fffc0e5b92c9bda7e376983fdc90b498eed745 (diff) | |
| parent | eb30d42b5dd3ed5bb37336ed46a59eabaca81e06 (diff) | |
Merge branch 'master' of github.com:openscad/openscad into misc_updates
Conflicts:
scripts/uni-build-dependencies.sh
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/check-dependencies.sh | 2 | ||||
| -rwxr-xr-x | scripts/uni-build-dependencies.sh | 20 |
2 files changed, 17 insertions, 5 deletions
diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh index eaed556..6a3e637 100755 --- a/scripts/check-dependencies.sh +++ b/scripts/check-dependencies.sh @@ -449,7 +449,7 @@ check_old_local() warnon= if [ "`uname | grep -i linux`" ]; then header_list="opencsg.h CGAL boost GL/glew.h gmp.h mpfr.h eigen2 eigen3" - liblist="libboost libopencsg libCGAL libglew" + liblist="libboost_system libboost_system-mt libopencsg libCGAL libglew" for i in $header_list $liblist; do if [ -e /usr/local/include/$i ]; then echo "Warning: you have a copy of "$i" under /usr/local/include" diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh index bf5ca1c..09b6b79 100755 --- a/scripts/uni-build-dependencies.sh +++ b/scripts/uni-build-dependencies.sh @@ -232,16 +232,28 @@ build_boost() fi fi # We only need certain portions of boost - ./bootstrap.sh --prefix=$DEPLOYDIR --with-libraries=thread,program_options,filesystem,system,regex + if [ -e ./bootstrap.sh ]; then + BSTRAPBIN=./bootstrap.sh + else + BSTRAPBIN=./configure + fi + $BSTRAPBIN --prefix=$DEPLOYDIR --with-libraries=thread,program_options,filesystem,system,regex + if [ -e ./b2 ]; then + BJAMBIN=./b2; + elif [ -e ./bjam ]; then + BJAMBIN=./bjam + elif [ -e ./Makefile ]; then + BJAMBIN=make + fi if [ $CXX ]; then if [ $CXX = "clang++" ]; then - ./b2 -j$NUMCPU toolset=clang install + $BJAMBIN -j$NUMCPU toolset=clang install # ./b2 -j$NUMCPU toolset=clang cxxflags="-stdlib=libc++" linkflags="-stdlib=libc++" install fi else - ./b2 -j$NUMCPU + $BJAMBIN -j$NUMCPU if [ $? = 0 ]; then - ./b2 install + $BJAMBIN install else echo boost build failed exit 1 |