Update of /cvsroot/boost/boost/tools/build/v2/tools
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8379
Modified Files:
Tag: RC_1_34_0
python.jam
Log Message:
Fix the use of system library dependencies
Index: python.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/python.jam,v
retrieving revision 1.12.2.46
retrieving revision 1.12.2.47
diff -u -d -r1.12.2.46 -r1.12.2.47
--- python.jam 23 Mar 2007 14:21:49 -0000 1.12.2.46
+++ python.jam 28 Mar 2007 12:44:08 -0000 1.12.2.47
@@ -581,9 +581,8 @@
# in both the single- and multi-threaded cases, and that system
# libraries don't change their ABIs either.
#
-# Returns a list consisting of ungristed library names to be used as
-# direct dependencies and conditional library names to be added to
-# target conditions.
+# Returns a list of usage-requirements that link to the necessary
+# system libraries.
local rule system-library-dependencies ( target-os )
{
switch $(target-os)
@@ -593,18 +592,18 @@
# sun toolset adds -lrt unconditionally). While this
# appears to duplicate the logic already in gcc.jam, it
# doesn't as long as we're not forcing <threading>multi.
- return pthread dl <toolset>gcc:<library>rt ;
+ return <library>pthread <library>dl <toolset>gcc:<library>rt ;
- case osf : return pthread <toolset>gcc:<library>rt ;
+ case osf : return <library>pthread <toolset>gcc:<library>rt ;
case qnx* : return ;
case darwin : return ;
case windows : return ;
- case hpux : return rt ;
+ case hpux : return <library>rt ;
- case * : return pthread dl <toolset>gcc:<library>util ;
+ case * : return <library>pthread <library>dl
<toolset>gcc:<library>util ;
}
}
@@ -778,33 +777,21 @@
#
# End autoconfiguration sequence
#
+ local target-requirements = $(condition) ;
- # Add the version, if any, to the condition
+ # Add the version, if any, to the target requirements
if $(version)
{
if ! $(version) in [ feature.values python ]
{
feature.extend python : $(version) ;
}
- condition += <python>$(version:E=default) ;
+ target-requirements += <python>$(version:E=default) ;
}
- condition += <target-os>$(target-os) ;
+ target-requirements += <target-os>$(target-os) ;
- # Set up the PYTHON variable to point at the interpreter.
- local target-requirements = $(condition) ;
- local system-libs ;
- for local x in [ system-library-dependencies $(target-os) ]
- {
- if $(x:G)
- {
- target-requirements += $(x) ;
- }
- else
- {
- system-libs += $(x) ;
- }
- }
+ local usage-requirements = [ system-library-dependencies $(target-os) ] ;
# See if we can find a framework directory on darwin
local framework-directory ;
@@ -835,7 +822,7 @@
dll-path += $(exec-prefix) ;
}
- local usage-requirements = <include>$(includes)
<python.interpreter>$(interpreter-cmd) ;
+ usage-requirements += <include>$(includes)
<python.interpreter>$(interpreter-cmd) ;
#
# Declare the "python" target. This should really be called
@@ -855,7 +842,7 @@
{
declare-libpython-target $(version) : $(target-requirements) ;
alias python
- : $(system-libs)
+ :
: $(target-requirements)
:
# why python.lib must be listed here instead of along with
-------------------------------------------------------------------------
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
