Update of /cvsroot/boost/boost/tools/build/v2/tools
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24994
Modified Files:
Tag: RC_1_34_0
python.jam
Log Message:
Remove -lpthread for SunOS
Index: python.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/python.jam,v
retrieving revision 1.12.2.47
retrieving revision 1.12.2.48
diff -u -d -r1.12.2.47 -r1.12.2.48
--- python.jam 28 Mar 2007 12:44:08 -0000 1.12.2.47
+++ python.jam 31 Mar 2007 00:08:28 -0000 1.12.2.48
@@ -42,8 +42,6 @@
# not in whatever project we were called by.
.project = [ project.current ] ;
-.alias-defined = ;
-
# Dynamic linker lib. Necessary to specify it explicitly
# on some platforms.
lib dl ;
@@ -408,7 +406,7 @@
# Assume "python-cmd" invokes a python interpreter and invoke it to
# extract all the information we care about from its "sys" module.
# Returns void if unsuccessful.
-rule dump-sys ( python-cmd )
+local rule probe ( python-cmd )
{
# Avoid invoking a Cygwin symlink on NT
local skip-symlink ;
@@ -592,8 +590,14 @@
# 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 <library>pthread <library>dl <toolset>gcc:<library>rt ;
-
+
+ # Caleb Epstein reports that his python's
+ # distutils.sysconfig.get_config_var('LIBS') yields
+ # -lresolv -lsocket -lnsl -lrt -ldl. However, we're not
+ # yet sure that is the right list for extension modules.
+ # Being conservative, we add rt and remove pthread, which
+ # was causing errors.
+ return <library>dl <toolset>gcc:<library>rt ;
case osf : return <library>pthread <toolset>gcc:<library>rt ;
@@ -678,7 +682,7 @@
if ! ( $(interpreter-cmd) && $(includes) && $(libraries) )
{
# Values to be extracted from python's sys module. These will
- # be set by the dump-sys rule, above, using Jam's dynamic scoping.
+ # be set by the probe rule, above, using Jam's dynamic scoping.
local sys-elements = version platform prefix exec_prefix executable ;
local sys.$(sys-elements) ;
@@ -702,7 +706,7 @@
cmds-to-try = $(cmds-to-try[2-]) ;
debug-message Checking interpreter command \"$(cmd)\"... ;
- if [ dump-sys $(cmd) ]
+ if [ probe $(cmd) ]
{
fallback-version ?= $(sys.version) ;
-------------------------------------------------------------------------
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
