boost/boost-1.57.0-python-abi_letters.patch
Adam Majer aac9ce8238 Accepting request 729933 from home:adamm:boost_test
- Update to version 1.71.0
  Breaking changes:
  * Uuid: MD5 name-based uuid generation was corrected to be identical
    on all endian systems. Define BOOST_UUID_COMPAT_PRE_1_71_MD5 to
    keep the result in a format compatible with 1.66 through 1.70.
    This does not affect the default name-based uuid generation
    which is based on SHA1
  * Test: Boost.Test shows deprecation warnings if some very old
    headers as deprecated. If you encounter such warnings, please
    follow the indications: those headers will be removed in a future
    release.
  New libraries:
  * Variant2: A never-valueless, strong guarantee implementation
    of std::variant
  Updated libraries:
  * align, asio, any, beast, circular buffer, container, context,
    conversion, core, dynamic bitset, endian, fiber, filesystem,
    flyweight, histogram, iostreams, interprocess, intrusive,
    legical cast, log, math, metaparse, move, multi array,
    multi-index containers, outcome, parameter, ptrcontainer,
    polycollection, smartptr, stacktrace, test, utility, uuid,
    variant, yap
  For detailed changes see
  https://www.boost.org/users/history/version_1_71_0.html
- drop upstream patches no longer needed:
  boost-1.57.0-python-libpython_dep.patch,
  0001-beast-fix-moved-from-executor.patch,
  remove_boost_serialization_depends, cmake.patch
- updated patches: boost-1.57.0-python-abi_letters.patch,
  3ecbf83f.patch

OBS-URL: https://build.opensuse.org/request/show/729933
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=232
2019-09-10 16:19:29 +00:00

83 lines
3.0 KiB
Diff

Index: boost_1_71_0/tools/build/src/tools/python.jam
===================================================================
--- boost_1_71_0.orig/tools/build/src/tools/python.jam
+++ boost_1_71_0/tools/build/src/tools/python.jam
@@ -99,7 +99,7 @@ py3-version = ;
# using python : 2.3 : /usr/local/bin/python ;
#
rule init ( version ? : cmd-or-prefix ? : includes * : libraries ?
- : condition * : extension-suffix ? )
+ : condition * : extension-suffix ? : abi-letters ? )
{
project.push-current $(.project) ;
@@ -112,7 +112,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 ;
}
@@ -507,7 +507,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) ;
@@ -668,7 +668,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.
@@ -692,13 +692,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 ;
@@ -714,6 +714,7 @@ local rule configure ( version ? : cmd-o
extension-suffix ?= _d ;
}
extension-suffix ?= "" ;
+ abi-letters ?= "" ;
local cmds-to-try ;
@@ -789,7 +790,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) ;
@@ -970,7 +971,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