boost: update to 1.77.0

This commit is contained in:
Orgad Shaneh
2021-09-10 11:13:21 +03:00
parent 1fda35793e
commit d64fb63506
15 changed files with 51 additions and 573 deletions

View File

@@ -1,6 +1,6 @@
--- boost_1_56_0/tools/build/src/tools/python.jam.orig 2014-01-29 22:13:34.032800000 +0400
+++ boost_1_56_0/tools/build/src/tools/python.jam 2014-01-29 22:24:39.674600000 +0400
@@ -506,44 +506,11 @@
--- boost_1_77_0/tools/build/src/tools/python.jam.orig 2021-09-09 17:58:15.722392400 +0300
+++ boost_1_77_0/tools/build/src/tools/python.jam 2021-09-10 10:22:53.310231600 +0300
@@ -514,50 +514,9 @@ local rule compute-default-paths ( targe
{
exec-prefix ?= $(prefix) ;
@@ -31,24 +31,30 @@
-
- debug-message "and \""$(default-include-path[1])"\" to default #include path" ;
- }
+ includes ?= $(prefix)/include/python$(version) ;
-
- libraries ?= $(default-library-path) ;
- includes ?= $(default-include-path) ;
- }
- else
- {
- includes ?= $(prefix)/include/python$(version) ;
+ local lib = $(exec-prefix)/lib ;
+ libraries ?= $(lib)/python$(version)/config $(lib) ;
- local default-include-path = $(prefix)/include/python$(version) ;
- if ! [ path.exists $(default-include-path) ] && [ path.exists $(default-include-path)m ]
- {
- default-include-path = $(default-include-path)m ;
- }
-
- includes ?= $(default-include-path) ;
-
- local lib = $(exec-prefix)/lib ;
- libraries ?= $(lib)/python$(version)/config $(lib) ;
- }
+ libraries ?= $(lib)/python$(version)/config $(lib) ;
+ includes ?= $(prefix)/include/python$(version) ;
+ local lib = $(exec-prefix)/lib ;
}
# The version of the python interpreter to use.
@@ -565,32 +532,15 @@
@@ -579,32 +538,15 @@ variant debug-python : debug : <python-d
local rule candidate-interpreters ( version ? : prefix ? : target-os )
{
local bin-path = bin ;
@@ -86,7 +92,7 @@
}
@@ -658,15 +608,6 @@
@@ -682,15 +624,6 @@ local rule declare-libpython-target ( ve
# Compute the representation of Python version in the name of Python's
# library file.
local lib-version = $(version) ;
@@ -102,7 +108,7 @@
if ! $(lib-version)
{
@@ -694,10 +635,6 @@
@@ -718,10 +651,6 @@ local rule configure ( version ? : cmd-o
target-os ?= [ feature.defaults target-os ] ;
target-os = $(target-os:G=) ;
@@ -111,9 +117,9 @@
- extension-suffix ?= _d ;
- }
extension-suffix ?= "" ;
abi-letters ?= "" ;
# Normalize and dissect any version number.
@@ -721,13 +658,7 @@
@@ -738,13 +667,7 @@ local rule configure ( version ? : cmd-o
# Work with the command the user gave us.
cmds-to-try = $(cmd-or-prefix) ;
@@ -128,7 +134,7 @@
}
# Values to use in case we can not really find anything in the system.
@@ -936,11 +867,6 @@
@@ -994,11 +917,6 @@ local rule configure ( version ? : cmd-o
# environment variable set up, and the user may want to use it for
# something else (e.g. launch the debugger).
local set-PYTHONPATH ;