diff --git a/Jamfile b/Jamfile index df9dce7a7..116ccb0e3 100755 --- a/Jamfile +++ b/Jamfile @@ -209,9 +209,18 @@ rule linking ( properties * ) } else { - result += boost_system ; - result += boost_chrono ; - result += boost_random ; + if static in $(properties) + { + result += boost_system/static ; + result += boost_chrono/static ; + result += boost_random/static ; + } + else + { + result += boost_system/shared ; + result += boost_chrono/shared ; + result += boost_random/shared ; + } # on mac the boost headers are installed in # a directory that isn't automatically accessable @@ -475,9 +484,6 @@ feature.compose unicode : _UNICODE UNICODE ; feature deprecated-functions : on off : composite propagated link-incompatible ; feature.compose off : TORRENT_NO_DEPRECATE ; -feature upnp-logging : off on : composite propagated link-incompatible ; -feature.compose on : TORRENT_UPNP_LOGGING ; - feature boost : system source : link-incompatible propagated ; feature boost-link : static shared : propagated composite ; @@ -560,7 +566,6 @@ lib z : : shared z /usr/lib ; lib crypto : : crypto shared /usr/lib z ; lib ssl : : ssl shared crypto /opt/local/lib ; lib dl : : shared dl ; -lib aio : : shared aio ; # time functions used on linux require librt lib librt : : rt shared ; diff --git a/bindings/python/Jamfile b/bindings/python/Jamfile index 66a27b156..2932d3963 100755 --- a/bindings/python/Jamfile +++ b/bindings/python/Jamfile @@ -12,10 +12,11 @@ lib boost_python : : boost_python ; feature visibility : default hidden : composite propagated link-incompatible ; feature.compose hidden : -fvisibility=hidden -fvisibility-inlines-hidden ; -feature libtorrent-link : static shared : ; +feature libtorrent-link : shared static : composite propagated ; feature libtorrent-python-pic : off on : composite propagated link-incompatible ; feature.compose on : -fPIC ; + rule libtorrent_linking ( properties * ) { local result ; @@ -135,9 +136,8 @@ my-python-extension libtorrent : # requirements src @libtorrent_linking - : # default build - static - static + : # usage-requirements + @libtorrent_linking false ;