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