Update of /cvsroot/boost/boost/libs/iostreams/build
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21997
Modified Files:
Jamfile.v2
Log Message:
Fix building bzlib and zlib from source on Windows.
Patch from David Deakins.
Index: Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/iostreams/build/Jamfile.v2,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Jamfile.v2 17 Oct 2006 12:52:11 -0000 1.8
+++ Jamfile.v2 20 Mar 2007 07:30:43 -0000 1.9
@@ -32,7 +32,7 @@
# main target and returns it. If compression is disabled, returns nothing.
# The 'sources' argument is the list of sources names for the library,
# which will be used if building the library.
-rule create-library ( library-name : windows-name unix-name : sources + )
+rule create-library ( library-name : windows-name unix-name : sources + :
requirements * )
{
local LIB = $(library-name:U) ;
if ! $(library-name) in zlib bzip2
@@ -68,13 +68,14 @@
$(LIB)_INCLUDE = $($(LIB)_SOURCE) ;
}
- # Should be use prebuilt library or built it owselfs?
+ # Should we use prebuilt library or build it ourselves?
if $($(LIB)_SOURCE)
{
return [ lib boost_$(library-name)
: $($(LIB)_SOURCE)/$(sources).c
: <include>$($(LIB)_INCLUDE)
<location-prefix>$(LIB:L)
+ $(requirements)
:
: <include>$($(LIB)_INCLUDE)
] ;
@@ -115,7 +116,8 @@
local sources ;
local z = [ create-library zlib : zll z : adler32 compress
- crc32 deflate gzio infback inffast inflate inftrees trees uncompr zutil ]
;
+ crc32 deflate gzio infback inffast inflate inftrees trees uncompr zutil :
+ <link>shared:<define>ZLIB_DLL ] ;
if $(z)
{
@@ -124,7 +126,8 @@
local bz2 = [ create-library bzip2 : libbz2 bz2 :
blocksort bzlib compress crctable decompress huffman
- mk251 randtable ] ;
+ mk251 randtable :
+ <link>shared:<def-file>$(BZIP2_SOURCE)/libbz2.def ] ;
if $(bz2)
{
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
