|
 |
2a67b3 |
--- boost_1_57_0/tools/build/src/tools/python.jam 2013-05-21 06:14:18.000000000 +0200
|
|
|
2a67b3 |
+++ boost_1_55_0/tools/build/src/tools/python.jam 2014-05-29 19:09:12.115413877 +0200
|
|
|
2a67b3 |
@@ -94,7 +94,7 @@ feature.feature pythonpath : : free opti
|
|
|
2a67b3 |
# using python : 2.3 : /usr/local/bin/python ;
|
|
|
2a67b3 |
#
|
|
|
2a67b3 |
rule init ( version ? : cmd-or-prefix ? : includes * : libraries ?
|
|
|
2a67b3 |
- : condition * : extension-suffix ? )
|
|
|
2a67b3 |
+ : condition * : extension-suffix ? : abi-letters ? )
|
|
|
2a67b3 |
{
|
|
|
2a67b3 |
project.push-current $(.project) ;
|
|
|
2a67b3 |
|
|
|
2a67b3 |
@@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ?
|
|
|
2a67b3 |
}
|
|
|
2a67b3 |
}
|
|
|
2a67b3 |
|
|
|
2a67b3 |
- configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) ;
|
|
|
2a67b3 |
+ configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) : $(abi-letters) ;
|
|
|
2a67b3 |
|
|
|
2a67b3 |
project.pop-current ;
|
|
|
2a67b3 |
}
|
|
|
2a67b3 |
@@ -653,7 +653,7 @@ local rule system-library-dependencies (
|
|
|
2a67b3 |
|
|
|
2a67b3 |
# Declare a target to represent Python's library.
|
|
|
2a67b3 |
#
|
|
|
2a67b3 |
-local rule declare-libpython-target ( version ? : requirements * )
|
|
|
2a67b3 |
+local rule declare-libpython-target ( version ? : requirements * : abi-letters ? )
|
|
|
2a67b3 |
{
|
|
|
2a67b3 |
# Compute the representation of Python version in the name of Python's
|
|
|
2a67b3 |
# library file.
|
|
|
2a67b3 |
@@ -677,13 +677,13 @@ local rule declare-libpython-target ( ve
|
|
|
2a67b3 |
}
|
|
|
2a67b3 |
|
|
|
2a67b3 |
# Declare it.
|
|
|
2a67b3 |
- lib python.lib : : <name>python$(lib-version) $(requirements) ;
|
|
|
2a67b3 |
+ lib python.lib : : <name>python$(lib-version)$(abi-letters) $(requirements) ;
|
|
|
2a67b3 |
}
|
|
|
2a67b3 |
|
|
|
2a67b3 |
|
|
|
2a67b3 |
# Implementation of init.
|
|
|
2a67b3 |
local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
|
|
|
2a67b3 |
- condition * : extension-suffix ? )
|
|
|
2a67b3 |
+ condition * : extension-suffix ? : abi-letters ? )
|
|
|
2a67b3 |
{
|
|
|
2a67b3 |
local prefix ;
|
|
|
2a67b3 |
local exec-prefix ;
|
|
|
2a67b3 |
@@ -699,6 +699,7 @@ local rule configure ( version ? : cmd-o
|
|
|
2a67b3 |
extension-suffix ?= _d ;
|
|
|
2a67b3 |
}
|
|
|
2a67b3 |
extension-suffix ?= "" ;
|
|
|
2a67b3 |
+ abi-letters ?= "" ;
|
|
|
2a67b3 |
|
|
|
2a67b3 |
local cmds-to-try ;
|
|
|
2a67b3 |
|
|
|
2a67b3 |
@@ -922,7 +923,7 @@ local rule configure ( version ? : cmd-o
|
|
|
2a67b3 |
}
|
|
|
2a67b3 |
else
|
|
|
2a67b3 |
{
|
|
|
2a67b3 |
- declare-libpython-target $(version) : $(target-requirements) ;
|
|
|
2a67b3 |
+ declare-libpython-target $(version) : $(target-requirements) : $(abi-letters) ;
|
|
|
2a67b3 |
|
|
|
2a67b3 |
# This is an evil hack. On, Windows, when Python is embedded, nothing
|
|
|
2a67b3 |
# seems to set up sys.path to include Python's standard library
|