[Boost-commit] svn:boost r62937 - trunk/libs/iostreams/build

Subject: [Boost-commit] svn:boost r62937 - trunk/libs/iostreams/build
From: steven_at_[hidden]
Date: 2010-06-14 13:48:16

Author: steven_watanabe
Date: 2010-06-14 13:48:16 EDT (Mon, 14 Jun 2010)
New Revision: 62937
URL: http://svn.boost.org/trac/boost/changeset/62937

Log:
Allow building zlib 1.2.4+, using a glob to include only source files that actually exist.  Fixes #4091.
Text files modified: 
   trunk/libs/iostreams/build/Jamfile.v2 |     6 ++++--                                  
   1 files changed, 4 insertions(+), 2 deletions(-)

Modified: trunk/libs/iostreams/build/Jamfile.v2
==============================================================================
--- trunk/libs/iostreams/build/Jamfile.v2	(original)
+++ trunk/libs/iostreams/build/Jamfile.v2	2010-06-14 13:48:16 EDT (Mon, 14 Jun 2010)
@@ -19,6 +19,7 @@
 
 import modules ;
 import os ;
+import path ;
 local debug = [ MATCH (--debug-configuration) : [ modules.peek : ARGV ] ] ;
 
 for local v in NO_COMPRESSION 
@@ -89,7 +90,7 @@
         if $($(LIB)_SOURCE)
         {
             return [ lib boost_$(library-name) 
-              : $($(LIB)_SOURCE)/$(sources).c
+              : [ path.glob $($(LIB)_SOURCE) : $(sources).c ]
               : <include>$($(LIB)_INCLUDE)
                 <location-prefix>$(LIB:L)
                 $(requirements)
@@ -133,7 +134,8 @@
 
 local sources = file_descriptor.cpp mapped_file.cpp ;
 local z = [ create-library zlib : zll z : adler32 compress 
-     crc32 deflate gzio infback inffast inflate inftrees trees uncompr zutil :
+     crc32 deflate gzclose gzio gzlib gzread gzwrite
+     infback inffast inflate inftrees trees uncompr zutil :
      <link>shared:<define>ZLIB_DLL ] ;
 
 if $(z)