d2c3a27558
A change to tools/build/src/tools/python.jam means that the python=2.7 argument to b2 is ignored and both libboost_python.so and libboost_python3.so are linked to libpython2.7.so. Reverting that change restores the previous behaviour that allowed building Boost.Python in two different ways.
47 lines
2.4 KiB
Diff
47 lines
2.4 KiB
Diff
--- boost_1_63_0/tools/build/src/tools/python.jam.orig 2017-02-16 18:51:14.005483084 +0000
|
|
+++ boost_1_63_0/tools/build/src/tools/python.jam 2017-02-16 18:51:24.912497496 +0000
|
|
@@ -926,27 +926,27 @@
|
|
# for a particular target OS as the default. This makes it so that we can
|
|
# select a python interpreter with only knowledge of the target OS. And hence
|
|
# can configure different Pythons based on the target OS only.
|
|
- local toolset-requirements = [ toolset.requirements ] ;
|
|
- local toolset-target-os-requirements
|
|
- = [ property.evaluate-conditionals-in-context
|
|
- [ $(toolset-requirements).raw ] : <target-os>$(target-os) ] ;
|
|
- if ! <python> in $(toolset-target-os-requirements:G)
|
|
- {
|
|
- toolset.add-requirements <target-os>$(target-os):<python>$(version:E=default) ;
|
|
- }
|
|
+ #local toolset-requirements = [ toolset.requirements ] ;
|
|
+ #local toolset-target-os-requirements
|
|
+ # = [ property.evaluate-conditionals-in-context
|
|
+ # [ $(toolset-requirements).raw ] : <target-os>$(target-os) ] ;
|
|
+ #if ! <python> in $(toolset-target-os-requirements:G)
|
|
+ #{
|
|
+ # toolset.add-requirements <target-os>$(target-os):<python>$(version:E=default) ;
|
|
+ #}
|
|
|
|
# We also set a default requirement that assigns the first python configured
|
|
# for a particular target OS as the default. This makes it so that we can
|
|
# select a python interpreter with only knowledge of the target OS. And hence
|
|
# can configure different Pythons based on the target OS only.
|
|
- local toolset-requirements = [ toolset.requirements ] ;
|
|
- local toolset-target-os-requirements
|
|
- = [ property.evaluate-conditionals-in-context
|
|
- [ $(toolset-requirements).raw ] : <target-os>$(target-os) ] ;
|
|
- if ! <python> in $(toolset-target-os-requirements:G)
|
|
- {
|
|
- toolset.add-requirements <target-os>$(target-os):<python>$(version:E=default) ;
|
|
- }
|
|
+ #local toolset-requirements = [ toolset.requirements ] ;
|
|
+ #local toolset-target-os-requirements
|
|
+ # = [ property.evaluate-conditionals-in-context
|
|
+ # [ $(toolset-requirements).raw ] : <target-os>$(target-os) ] ;
|
|
+ #if ! <python> in $(toolset-target-os-requirements:G)
|
|
+ #{
|
|
+ # toolset.add-requirements <target-os>$(target-os):<python>$(version:E=default) ;
|
|
+ #}
|
|
|
|
# Register the right suffix for extensions.
|
|
register-extension-suffix $(extension-suffix) : $(target-requirements) ;
|