From edf5e5eefcd15cfc49040d931a7cd36bdfa854b5 Mon Sep 17 00:00:00 2001 From: arvidn Date: Mon, 27 Jul 2015 08:14:43 -0700 Subject: [PATCH] use LD_LIBRARY_PATH to try to make the python test find libtorrent.so --- .travis.yml | 4 +--- bindings/python/setup.py | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b9b799e4f..933434bd3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,8 +30,6 @@ addons: - python2.7-dev install: - #- if [ $TRAVIS_OS_NAME == "linux" ]; then sudo add-apt-repository -y ppa:boost-latest/ppa; sudo apt-get update -qq; fi - #- if [ $TRAVIS_OS_NAME == "linux" ]; then sudo apt-get install libboost1.54-all-dev python2.7-dev; fi - if [ $TRAVIS_OS_NAME == "osx" ]; then sudo brew install boost boost-build python27-dev; fi - 'echo "using gcc : : ccache g++ ;" > ~/user-config.jam' - 'echo "using clang : : ccache clang++ ;" >> ~/user-config.jam' @@ -47,5 +45,5 @@ script: - bjam -j 3 variant=$variant warnings=off $CC - cd ../bindings/python - bjam -j 3 variant=$variant warnings=off $CC stage_module - - python test.py + - LD_LIBRARY_PATH=. python test.py - ccache --show-stats diff --git a/bindings/python/setup.py b/bindings/python/setup.py index f4cd49324..deef53586 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -71,7 +71,7 @@ if '--bjam' in sys.argv or ldflags == None or extra_cmd == None: parallel_builds = ' -j%d' % multiprocessing.cpu_count() # build libtorrent using bjam and build the installer with distutils - cmdline = 'b2 boost=source link=static boost-link=static release optimization=space stage_module --abbreviate-paths' + toolset + parallel_builds + cmdline = 'b2 boost=source libtorrent-link=static boost-link=static release optimization=space stage_module --abbreviate-paths' + toolset + parallel_builds print(cmdline) if os.system(cmdline) != 0: print('build failed') @@ -85,7 +85,7 @@ if '--bjam' in sys.argv or ldflags == None or extra_cmd == None: except: pass try: os.mkdir('libtorrent') except: pass - shutil.copyfile('libtorrent' + file_ext, 'build/lib/libtorrent' + file_ext) + shutil.copyfile('py_libtorrent' + file_ext, 'build/lib/libtorrent' + file_ext) packages = ['libtorrent']