[Boost-commit] svn:boost r83943 - in trunk/libs/log: build example/doc example/wide_char test

Subject: [Boost-commit] svn:boost r83943 - in trunk/libs/log: build example/doc example/wide_char test
From: andrey.semashev_at_[hidden]
Date: 2013-04-17 15:37:58

Author: andysem
Date: 2013-04-17 15:37:57 EDT (Wed, 17 Apr 2013)
New Revision: 83943
URL: http://svn.boost.org/trac/boost/changeset/83943

Log:
Fixing linking the tests against the library.
Text files modified: 
   trunk/libs/log/build/Jamfile.v2             |    34 +++++++++++++++++++++++++---------      
   trunk/libs/log/example/doc/Jamfile.v2       |     4 ++--                                    
   trunk/libs/log/example/wide_char/Jamfile.v2 |     4 ++--                                    
   trunk/libs/log/test/Jamfile.v2              |     1 -                                       
   4 files changed, 29 insertions(+), 14 deletions(-)

Modified: trunk/libs/log/build/Jamfile.v2
==============================================================================
--- trunk/libs/log/build/Jamfile.v2	(original)
+++ trunk/libs/log/build/Jamfile.v2	2013-04-17 15:37:57 EDT (Wed, 17 Apr 2013)
@@ -25,7 +25,8 @@
 project boost/log
     : source-location ../src
     : requirements
-        <link>shared:<define>BOOST_LOG_DLL
+        <define>BOOST_SPIRIT_USE_PHOENIX_V3=1
+        <define>BOOST_THREAD_DONT_USE_CHRONO=1 # Don't introduce false dependency on Boost.Chrono
         <logapi>unix:<define>BOOST_LOG_USE_NATIVE_SYSLOG=1
         <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
@@ -45,6 +46,9 @@
         <library>/boost/system//boost_system
         <threading>single:<define>BOOST_LOG_NO_THREADS
         <threading>multi:<library>/boost/thread//boost_thread
+        <target-os>freebsd:<linkflags>"-lrt"
+        <target-os>linux:<linkflags>"-lrt -lpthread"
+        <toolset>pgi:<linkflags>"-lrt"
     ;
 
 local no_event_log = [ MATCH (define=BOOST_LOG_WITHOUT_EVENT_LOG) : [ modules.peek : ARGV ] ] ;
@@ -100,10 +104,13 @@
         psapi
         ws2_32
     : ## requirements ##
+        <link>shared:<define>BOOST_LOG_DLL
         <define>BOOST_LOG_BUILDING_THE_LIB=1
-        <define>BOOST_SPIRIT_USE_PHOENIX_V3=1
-        <define>BOOST_THREAD_DONT_USE_CHRONO=1 # Don't introduce false dependency on Boost.Chrono
         <logapi>winnt
+    : ## default-build ##
+    : ## usage-requirements ##
+        <link>shared:<define>BOOST_LOG_DYN_LINK=1
+        <threading>single:<define>BOOST_LOG_NO_THREADS
     ;
 
 lib boost_log
@@ -111,10 +118,13 @@
         $(BOOST_LOG_COMMON_SRC)
       ## unix sources ##
     : ## requirements ##
+        <link>shared:<define>BOOST_LOG_DLL
         <define>BOOST_LOG_BUILDING_THE_LIB=1
-        <define>BOOST_SPIRIT_USE_PHOENIX_V3=1
-        <define>BOOST_THREAD_DONT_USE_CHRONO=1 # Don't introduce false dependency on Boost.Chrono
         <logapi>unix
+    : ## default-build ##
+    : ## usage-requirements ##
+        <link>shared:<define>BOOST_LOG_DYN_LINK=1
+        <threading>single:<define>BOOST_LOG_NO_THREADS
     ;
 
 
@@ -134,12 +144,15 @@
       ## winnt sources ##
         ws2_32
     : ## requirements ##
+        <link>shared:<define>BOOST_LOG_DYN_LINK=1
         <link>shared:<define>BOOST_LOG_SETUP_DLL
         <define>BOOST_LOG_SETUP_BUILDING_THE_LIB=1
-        <define>BOOST_SPIRIT_USE_PHOENIX_V3=1
-        <define>BOOST_THREAD_DONT_USE_CHRONO=1 # Don't introduce false dependency on Boost.Chrono
         <library>boost_log
         <logapi>winnt
+    : ## default-build ##
+    : ## usage-requirements ##
+        <link>shared:<define>BOOST_LOG_SETUP_DYN_LINK=1
+        <threading>single:<define>BOOST_LOG_NO_THREADS
     ;
 
 lib boost_log_setup
@@ -147,10 +160,13 @@
         $(BOOST_LOG_SETUP_COMMON_SRC)
       ## unix sources ##
     : ## requirements ##
+        <link>shared:<define>BOOST_LOG_DYN_LINK=1
         <link>shared:<define>BOOST_LOG_SETUP_DLL
         <define>BOOST_LOG_SETUP_BUILDING_THE_LIB=1
-        <define>BOOST_SPIRIT_USE_PHOENIX_V3=1
-        <define>BOOST_THREAD_DONT_USE_CHRONO=1 # Don't introduce false dependency on Boost.Chrono
         <library>boost_log
         <logapi>unix
+    : ## default-build ##
+    : ## usage-requirements ##
+        <link>shared:<define>BOOST_LOG_SETUP_DYN_LINK=1
+        <threading>single:<define>BOOST_LOG_NO_THREADS
     ;

Modified: trunk/libs/log/example/doc/Jamfile.v2
==============================================================================
--- trunk/libs/log/example/doc/Jamfile.v2	(original)
+++ trunk/libs/log/example/doc/Jamfile.v2	2013-04-17 15:37:57 EDT (Wed, 17 Apr 2013)
@@ -26,8 +26,8 @@
         <library>/boost/date_time//boost_date_time
         <library>/boost/filesystem//boost_filesystem
         <library>/boost/system//boost_system
-        <threading>single:<define>BOOST_LOG_NO_THREADS
-        <threading>multi:<library>/boost/thread//boost_thread
+        <library>/boost/thread//boost_thread
+        <threading>multi
     ;
 
 # Compiles each .cpp file in this directory into a separate executable

Modified: trunk/libs/log/example/wide_char/Jamfile.v2
==============================================================================
--- trunk/libs/log/example/wide_char/Jamfile.v2	(original)
+++ trunk/libs/log/example/wide_char/Jamfile.v2	2013-04-17 15:37:57 EDT (Wed, 17 Apr 2013)
@@ -25,8 +25,8 @@
         <library>/boost/filesystem//boost_filesystem
         <library>/boost/system//boost_system
         <library>/boost/locale//boost_locale
-        <threading>single:<define>BOOST_LOG_NO_THREADS
-        <threading>multi:<library>/boost/thread//boost_thread
+        <library>/boost/thread//boost_thread
+        <threading>multi
     ;
 
 exe wide_char

Modified: trunk/libs/log/test/Jamfile.v2
==============================================================================
--- trunk/libs/log/test/Jamfile.v2	(original)
+++ trunk/libs/log/test/Jamfile.v2	2013-04-17 15:37:57 EDT (Wed, 17 Apr 2013)
@@ -11,7 +11,6 @@
 project
     : requirements
         <include>common
-        <link>shared:<define>BOOST_ALL_DYN_LINK
         <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS