From 3d34d30afb0e3136ce724a5a16f43f59d5f1d8c4 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Sat, 20 Dec 2008 21:12:39 +0000
Subject: [PATCH] use -fvisibility=hidden for darwin and gcc toolkits

---
 Jamfile                 | 32 ++++++++++++++++++++++----------
 bindings/python/Jamfile | 20 +++++++++++++++++---
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/Jamfile b/Jamfile
index 2fc213fc0..9be994c0e 100755
--- a/Jamfile
+++ b/Jamfile
@@ -110,22 +110,29 @@ rule linking ( properties * )
 	{
 		if <boost-link>static in $(properties)
 		{
-			result += <library>/boost/thread//boost_thread/<link>static
-				<library>/boost/filesystem//boost_filesystem/<link>static
-				<library>/boost/system//boost_system/<link>static
-				<include>$(BOOST_ROOT)
-				<define>BOOST_ALL_NO_LIB
-				;
+			if <toolset>darwin in $(properties) || <toolset>gcc in $(properties)
+			{
+				result += <library>/boost/thread//boost_thread/<link>static/<cflags>-fvisibility=hidden
+					<library>/boost/filesystem//boost_filesystem/<link>static/<cflags>-fvisibility=hidden
+					<library>/boost/system//boost_system/<link>static
+#/<cflags>-fvisibility=hidden
+					;
+			}
+			else
+			{
+				result += <library>/boost/thread//boost_thread/<link>static
+					<library>/boost/filesystem//boost_filesystem/<link>static
+					<library>/boost/system//boost_system/<link>static
+					;
+			}
 		}
 		else
 		{
 			result += <library>/boost/thread//boost_thread/<link>shared
 				<library>/boost/filesystem//boost_filesystem/<link>shared
-				<library>/boost/system//boost_system/<link>shared
-				<include>$(BOOST_ROOT)
-				<define>BOOST_ALL_NO_LIB
-				;
+				<library>/boost/system//boost_system/<link>shared ;
 		}
+		result += <include>$(BOOST_ROOT) <define>BOOST_ALL_NO_LIB ;
 	}
 
 	if <boost>system in $(properties)
@@ -146,6 +153,11 @@ rule building ( properties * )
 {
 	local result ;
 
+	if <toolset>gcc in $(properties) || <toolset>darwin in $(properties)
+	{
+		result += <cflags>-fvisibility=hidden ;
+	}
+
 	if ( <target-os>linux in $(properties)
 		|| <target-os>darwin in $(properties) )
 		&& ( <toolset>gcc in $(properties)
diff --git a/bindings/python/Jamfile b/bindings/python/Jamfile
index 60dc88d04..5d1f3aa05 100755
--- a/bindings/python/Jamfile
+++ b/bindings/python/Jamfile
@@ -2,7 +2,7 @@ import python ;
 
 use-project /torrent : ../.. ;
 
-lib boost_python : : <name>boost_python $(library-search-path) ;
+lib boost_python : : <name>boost_python-mt $(library-search-path) ;
 
 rule libtorrent_linking ( properties * )
 {
@@ -10,13 +10,28 @@ rule libtorrent_linking ( properties * )
 
     if <toolset>gcc in $(properties)
     {
-        result += <library>/torrent//torrent/<link>static/<cxxflags>-fPIC/<cflags>-fPIC <cxxflags>-fPIC ;
+        result += <library>/torrent//torrent/<link>static/<cflags>-fPIC
+            <cflags>-fPIC ;
     }
     else
     {
         result += <library>/torrent//torrent/<link>static ;
     }
 
+    if <toolset>gcc in $(properties) || <toolset>darwin in $(properties)
+    {
+        result += <cflags>-fvisibility=hidden ;
+
+        if <boost>source in $(properties) && <boost-link>static in $(properties)
+        {
+            result += <library>/boost/python//boost_python/<link>static/<cflags>-fvisibility=hidden ;
+        }
+    }
+    else if <boost>source in $(properties) && <boost-link>static in $(properties)
+    {
+        result += <library>/boost/python//boost_python/<link>static ;
+    }
+
     # when building peer_plugin.cpp on msvc-7.1 it fails
     # running out of internal heap space. Don't add it
     # to windows build, since it's not critical anyway
@@ -54,7 +69,6 @@ python-extension libtorrent
     src/magnet_uri.cpp
   : <include>src
     <boost>system:<library>boost_python
-    <boost>source,<boost-link>static:<library>/boost/python//boost_python/<link>static
     <boost>source,<boost-link>shared:<library>/boost/python//boost_python/<link>shared
     <conditional>@libtorrent_linking
   ;