From 26d58d405780557209f11363b8e339b6c457b7df Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Thu, 25 Sep 2008 03:30:08 +0000 Subject: [PATCH] Fix #503 change the boost lib detection logic to first look for -mt and if not available, fall back to regular boost lib (non-multithreaded) --- ChangeLog | 2 ++ setup.py | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b432ee5b..0581fc783 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Deluge 1.0.1 (In Development) Misc: * Fix #187 set a 5 second timer to save the config file after a config value has been changed. + * Fix #503 change the boost lib detection logic to first look for -mt and + if not available, fall back to regular boost lib (non-multithreaded) Deluge 1.0.0 - "Sharks Are Bulletproof" (21 September 2008) Core: diff --git a/setup.py b/setup.py index 85c0fe2d4..856412581 100644 --- a/setup.py +++ b/setup.py @@ -145,12 +145,10 @@ else: ] # Modify the libs if necessary for systems with only -mt boost libs - if not os.path.exists( - os.path.join(sysconfig.PREFIX, "lib", "libboost_filesystem.so")): - # It's likely that this system doesn't have symlinks setup - # So add '-mt' to the libraries - for lib in _libraries: - if lib[:6] == "boost_": + for lib in _libraries: + if lib[:6] == "boost_": + # If there is a -mt version use that + if os.path.exists(os.path.join(sysconfig.get_config_var("LIBDIR"), "lib" + lib + "-mt.so")): _libraries[_libraries.index(lib)] = lib + "-mt" _sources = glob.glob("./libtorrent/src/*.cpp") + \