Update of /cvsroot/boost/boost/tools/build/v2/tools
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25737
Modified Files:
Tag: RC_1_34_0
python.jam
Log Message:
Make sure that the libpython target is declared with distinct requirements each
time, thus forming valid target alternatives.
Index: python.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/python.jam,v
retrieving revision 1.12.2.36
retrieving revision 1.12.2.37
diff -u -d -r1.12.2.36 -r1.12.2.37
--- python.jam 16 Mar 2007 16:15:55 -0000 1.12.2.36
+++ python.jam 16 Mar 2007 23:05:14 -0000 1.12.2.37
@@ -620,12 +620,12 @@
# Declare a target to represent Python's library, returning the target
# name.
-local rule declare-libpython-target ( version ? : target-os )
+local rule declare-libpython-target ( version ? : sys.platform : requirements
* )
{
# Compute the representation of Python version in the name of
# Python's library file.
local lib-version = $(version) ;
- if $(target-os) = windows
+ if <target-os>windows in $(requirements)
{
local major-minor = [ split-version $(version) ] ;
lib-version = $(major-minor:J="") ;
@@ -636,7 +636,7 @@
libpython-target-name = $(libpython-target-name:J=-) ;
# Declare and return it
- lib $(libpython-target-name) : : <name>python$(lib-version) ;
+ lib $(libpython-target-name) : : <name>python$(lib-version)
$(requirements) ;
return $(libpython-target-name) ;
}
@@ -822,7 +822,9 @@
}
else
{
- local libpython-target-name = [ declare-libpython-target $(version) :
$(target-os) ] ;
+ local libpython-target-name
+ = [ declare-libpython-target $(version) : $(sys.platform) :
$(target-requirements) ] ;
+
alias python
: $(system-libs)
: $(target-requirements)
-------------------------------------------------------------------------
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
