[Boost-commit] svn:boost r84995 - in trunk: boost/context/detail libs/context/build libs/context/example

Subject: [Boost-commit] svn:boost r84995 - in trunk: boost/context/detail libs/context/build libs/context/example
From: oliver.kowalke_at_[hidden]
Date: 2013-07-10 02:37:40

Author: olli
Date: 2013-07-10 02:37:39 EDT (Wed, 10 Jul 2013)
New Revision: 84995
URL: http://svn.boost.org/trac/boost/changeset/84995

Log:
context: fix auto-link inc config.hpp

Text files modified: 
   trunk/boost/context/detail/config.hpp |    16 ++++++----------                        
   trunk/libs/context/build/Jamfile.v2   |     5 +++--                                   
   trunk/libs/context/example/Jamfile.v2 |     1 -                                       
   3 files changed, 9 insertions(+), 13 deletions(-)

Modified: trunk/boost/context/detail/config.hpp
==============================================================================
--- trunk/boost/context/detail/config.hpp	Tue Jul  9 17:22:15 2013	(r84994)
+++ trunk/boost/context/detail/config.hpp	2013-07-10 02:37:39 EDT (Wed, 10 Jul 2013)	(r84995)
@@ -14,16 +14,12 @@
 # undef BOOST_CONTEXT_DECL
 #endif
 
-#if defined(BOOST_HAS_DECLSPEC)
-# if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_CONTEXT_DYN_LINK)
-#  if ! defined(BOOST_DYN_LINK)
-#   define BOOST_DYN_LINK
-#  endif
-#  if defined(BOOST_CONTEXT_SOURCE)
-#   define BOOST_CONTEXT_DECL BOOST_SYMBOL_EXPORT
-#  else 
-#   define BOOST_CONTEXT_DECL BOOST_SYMBOL_IMPORT
-#  endif
+#if (defined(BOOST_ALL_DYN_LINK) || defined(BOOST_CONTEXT_DYN_LINK) ) && ! defined(BOOST_CONTEXT_STATIC_LINK)
+# if defined(BOOST_CONTEXT_SOURCE)
+#  define BOOST_CONTEXT_DECL BOOST_SYMBOL_EXPORT
+#  define BOOST_CONTEXT_BUILD_DLL
+# else
+#  define BOOST_CONTEXT_DECL BOOST_SYMBOL_IMPORT
 # endif
 #endif
 

Modified: trunk/libs/context/build/Jamfile.v2
==============================================================================
--- trunk/libs/context/build/Jamfile.v2	Tue Jul  9 17:22:15 2013	(r84994)
+++ trunk/libs/context/build/Jamfile.v2	2013-07-10 02:37:39 EDT (Wed, 10 Jul 2013)	(r84995)
@@ -15,11 +15,13 @@
 import architecture ;
 
 project boost/context
-    : source-location ../src
     : requirements
       <os>SOLARIS:<define>_XOPEN_SOURCE=600
+      <link>shared:<define>BOOST_CONTEXT_DYN_LINK=1
+      <define>BOOST_CONTEXT_SOURCE
     : usage-requirements
       <link>shared:<define>BOOST_CONTEXT_DYN_LINK=1
+    : source-location ../src
     ;
 
 local rule default_binary_format ( )
@@ -459,7 +461,6 @@
 
 lib boost_context
    : select_asm_context_sources
-   : <link>shared:<define>BOOST_CONTEXT_DYN_LINK=1
    ;
 
 boost-install boost_context ;

Modified: trunk/libs/context/example/Jamfile.v2
==============================================================================
--- trunk/libs/context/example/Jamfile.v2	Tue Jul  9 17:22:15 2013	(r84994)
+++ trunk/libs/context/example/Jamfile.v2	2013-07-10 02:37:39 EDT (Wed, 10 Jul 2013)	(r84995)
@@ -32,7 +32,6 @@
 project boost/context/example
     : requirements
       <library>/boost/context//boost_context
-      <define>BOOST_ALL_NO_LIB=1
       <link>static
     ;