some jamfile fixes for static linking

This commit is contained in:
Arvid Norberg 2010-12-25 07:24:00 +00:00
parent 1074fc1f31
commit b078cd5416
1 changed files with 11 additions and 10 deletions

21
Jamfile
View File

@ -50,8 +50,15 @@ rule linking ( properties * )
}
else
{
result += <library>crypto <library>ssl ;
result += <library>crypto <library>ssl <library>z ;
}
if <target-os>linux in $(properties)
{
# linker library on linux, required when using openssl
# result += <library>dl ;
}
}
# gcrypt libraries, if enabled
@ -190,14 +197,6 @@ rule building ( properties * )
if ! ( <encryption>off in $(properties) )
{
result += <source>src/pe_crypto.cpp ;
if <target-os>linux in $(properties)
&& <encryption>openssl in $(properties)
{
# linker library on linux, required when using openssl
result += <source>/usr/lib/libdl.so ;
}
}
return $(result) ;
@ -342,8 +341,10 @@ lib boost_system : : <name>boost_system ;
# openssl on linux/bsd/macos etc.
lib gcrypt : : <name>gcrypt <link>shared <search>/opt/local/lib ;
lib crypto : : <name>crypto <search>/lib ;
lib z : : <link>shared <name>z <search>/lib ;
lib crypto : : <name>crypto <search>/lib <use>z ;
lib ssl : : <name>ssl <link>shared <use>crypto ;
lib dl : : <link>shared <name>/libdl.so <search>/lib ;
# time functions used on linux require librt
lib librt : : <name>rt <link>shared ;