83 lines
2.9 KiB
Diff
83 lines
2.9 KiB
Diff
|
Index: boost_1_80_0/tools/build/src/tools/python.jam
|
||
|
|
===================================================================
|
||
|
|
--- boost_1_80_0.orig/tools/build/src/tools/python.jam
|
||
|
|
+++ boost_1_80_0/tools/build/src/tools/python.jam
|
||
|
|
@@ -102,7 +102,7 @@
|
||
|
|
# using python : 2.3 : /usr/local/bin/python ;
|
||
|
|
#
|
||
|
|
rule init ( version ? : cmd-or-prefix ? : includes * : libraries ?
|
||
|
|
- : condition * : extension-suffix ? )
|
||
|
|
+ : condition * : extension-suffix ? : abi-letters ? )
|
||
|
|
{
|
||
|
|
if ! $(.initialized)
|
||
|
|
{
|
||
|
|
@@ -115,7 +115,7 @@ rule init ( version ? : cmd-or-prefix ?
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
- configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) ;
|
||
|
|
+ configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) : $(abi-letters) ;
|
||
|
|
|
||
|
|
project.pop-current ;
|
||
|
|
}
|
||
|
|
@@ -510,7 +510,7 @@ local rule probe ( python-cmd )
|
||
|
|
# have a value based on the information given.
|
||
|
|
#
|
||
|
|
local rule compute-default-paths ( target-os : version ? : prefix ? :
|
||
|
|
- exec-prefix ? )
|
||
|
|
+ exec-prefix ? : abi-letters ? )
|
||
|
|
{
|
||
|
|
exec-prefix ?= $(prefix) ;
|
||
|
|
|
||
|
|
@@ -677,7 +677,7 @@ rule version-suffix ( version )
|
||
|
|
|
||
|
|
# Declare a target to represent Python's library.
|
||
|
|
#
|
||
|
|
-local rule declare-libpython-target ( version ? : requirements * )
|
||
|
|
+local rule declare-libpython-target ( version ? : requirements * : abi-letters ? )
|
||
|
|
{
|
||
|
|
# Compute the representation of Python version in the name of Python's
|
||
|
|
# library file.
|
||
|
|
@@ -701,13 +701,13 @@ local rule declare-libpython-target ( ve
|
||
|
|
}
|
||
|
|
|
||
|
|
# Declare it.
|
||
|
|
- lib python.lib : : <name>python$(lib-version) $(requirements) ;
|
||
|
|
+ lib python.lib : : <name>python$(lib-version)$(abi-letters) $(requirements) ;
|
||
|
|
}
|
||
|
|
|
||
|
|
|
||
|
|
# Implementation of init.
|
||
|
|
local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
|
||
|
|
- condition * : extension-suffix ? )
|
||
|
|
+ condition * : extension-suffix ? : abi-letters ? )
|
||
|
|
{
|
||
|
|
local prefix ;
|
||
|
|
local exec-prefix ;
|
||
|
|
@@ -723,6 +723,7 @@ local rule configure ( version ? : cmd-o
|
||
|
|
extension-suffix ?= _d ;
|
||
|
|
}
|
||
|
|
extension-suffix ?= "" ;
|
||
|
|
+ abi-letters ?= "" ;
|
||
|
|
|
||
|
|
local cmds-to-try ;
|
||
|
|
|
||
|
|
@@ -798,7 +799,7 @@ local rule configure ( version ? : cmd-o
|
||
|
|
exec-prefix = $(sys.exec_prefix) ;
|
||
|
|
|
||
|
|
compute-default-paths $(target-os) : $(sys.version) :
|
||
|
|
- $(sys.prefix) : $(sys.exec_prefix) ;
|
||
|
|
+ $(sys.prefix) : $(sys.exec_prefix) : $(sys.abi_letters) ;
|
||
|
|
|
||
|
|
version = $(sys.version) ;
|
||
|
|
interpreter-cmd ?= $(cmd) ;
|
||
|
|
@@ -979,7 +980,7 @@ local rule configure ( version ? : cmd-o
|
||
|
|
}
|
||
|
|
else
|
||
|
|
{
|
||
|
|
- declare-libpython-target $(version) : $(target-requirements) ;
|
||
|
|
+ declare-libpython-target $(version) : $(target-requirements) : $(abi-letters) ;
|
||
|
|
|
||
|
|
# This is an evil hack. On, Windows, when Python is embedded, nothing
|
||
|
|
# seems to set up sys.path to include Python's standard library
|