jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged jamfile fixes from RC_0_16

Browse Source
This commit is contained in:
Arvid Norberg
2013-04-27 19:35:41 +00:00
parent b4161aea6e
commit 7632393325
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Jamfile
View File

@@ -257,7 +257,8 @@ rule building ( properties * )
if ( <toolset>darwin in $(properties) if ( <toolset>darwin in $(properties)
|| <toolset>gcc in $(properties) || <toolset>gcc in $(properties)
|| <toolset>clang in $(propertoes) ) || <toolset>clang in $(propertoes)
|| <toolset>clang-darwin in $(propertoes) )
&& <link>shared in $(properties) && <link>shared in $(properties)
# on GCC, enabling debugging in libstdc++ # on GCC, enabling debugging in libstdc++
# breaks the ABI and its ability to appear # breaks the ABI and its ability to appear
@@ -596,6 +597,7 @@ local usage-requirements =
<toolset>gcc,<variant>debug:<cflags>-ftrapv <toolset>gcc,<variant>debug:<cflags>-ftrapv
<toolset>darwin,<variant>debug:<cflags>-ftrapv <toolset>darwin,<variant>debug:<cflags>-ftrapv
<toolset>clang:<cflags>-Wno-invalid-offsetof <toolset>clang:<cflags>-Wno-invalid-offsetof
<toolset>clang-darwin:<cflags>-Wno-invalid-offsetof
<boost>system:<cxxflags>$(CXXFLAGS) <boost>system:<cxxflags>$(CXXFLAGS)
<boost>system:<linkflags>$(LDFLAGS) <boost>system:<linkflags>$(LDFLAGS)
# this works around a bug in asio in boost-1.39 # this works around a bug in asio in boost-1.39

16
bindings/python/Jamfile
View File

@@ -15,22 +15,30 @@ rule libtorrent_linking ( properties * )
} }
if <toolset>gcc in $(properties) if <toolset>gcc in $(properties)
|| <toolset>darwin in $(properties) || <toolset>darwin in $(properties)
|| <toolset>clang in $(properties) || <toolset>clang in $(properties)
|| <toolset>clang-darwin in $(properties)
{ {
result += <cxxflags>-fvisibility=hidden ; result += <cxxflags>-fvisibility=hidden ;
} }
if <boost>source in $(properties) if <boost>source in $(properties)
{ {
if <boost-link>static in $(properties) || <link>static in $(properties) if <boost-link>static in $(properties)
{ {
result += <library>/boost/python//boost_python/<link>static ; result += <library>/boost/python//boost_python/<link>static ;
result += <library>/torrent//torrent/<link>static ;
} }
else else
{ {
result += <library>/boost/python//boost_python/<link>shared ; result += <library>/boost/python//boost_python/<link>shared ;
}
if <link>static in $(properties)
{
result += <library>/torrent//torrent/<link>static ;
}
else
{
result += <library>/torrent//torrent/<link>shared/<boost-link>shared ; result += <library>/torrent//torrent/<link>shared/<boost-link>shared ;
} }
} }