diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/macosx-build-dependencies.sh | 11 | ||||
| -rwxr-xr-x | scripts/macosx-sanity-check.py | 14 |
2 files changed, 17 insertions, 8 deletions
diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index ef4653c..f5a44d0 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -100,17 +100,18 @@ build_boost() { version=$1 bversion=`echo $version | tr "." "_"` - echo "Building boost::thread" $version "..." + echo "Building boost" $version "..." cd $BASEDIR/src rm -rf boost* curl -LO http://downloads.sourceforge.net/project/boost/boost/$version/boost_$bversion.tar.bz2 tar xjf boost_$bversion.tar.bz2 cd boost_$bversion - # We only need the thread library for now - ./bootstrap.sh --prefix=$DEPLOYDIR --with-libraries=thread + # We only need the thread and program_options libraries + ./bootstrap.sh --prefix=$DEPLOYDIR --with-libraries=thread,program_options ./bjam cflags="-mmacosx-version-min=10.5 -arch i386 -arch x86_64" linkflags="-mmacosx-version-min=10.5 -arch i386 -arch x86_64" ./bjam install install_name_tool -id $DEPLOYDIR/lib/libboost_thread.dylib $DEPLOYDIR/lib/libboost_thread.dylib + install_name_tool -id $DEPLOYDIR/lib/libboost_program_options.dylib $DEPLOYDIR/lib/libboost_program_options.dylib } build_cgal() @@ -158,7 +159,7 @@ echo "Using basedir:" $BASEDIR mkdir -p $SRCDIR $DEPLOYDIR build_gmp 5.0.1 build_mpfr 3.0.0 -build_boost 1.44.0 +build_boost 1.46.1 build_cgal 3.7 -build_glew 1.5.6 +build_glew 1.5.8 build_opencsg 1.3.0 diff --git a/scripts/macosx-sanity-check.py b/scripts/macosx-sanity-check.py index 243020f..3938d74 100755 --- a/scripts/macosx-sanity-check.py +++ b/scripts/macosx-sanity-check.py @@ -9,6 +9,9 @@ # # Author: Marius Kintel <marius@kintel.net> # +# This script lives here: +# https://github.com/kintel/MacOSX-tools +# import sys import os @@ -49,9 +52,14 @@ def lookup_library(file): def find_dependencies(file): libs = [] - p = subprocess.Popen(["otool", "-L", file], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - output = p.communicate()[0] - if p.returncode != 0: return None + args = ["otool", "-L", file] + if DEBUG: print "Executing " + " ".join(args) + p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + output,err = p.communicate() + if p.returncode != 0: + print "Failed with return code " + str(p.returncode) + ":" + print err + return None deps = output.split('\n') for dep in deps: # print dep |