Accepting request 439200 from home:adamm:branches:devel:libraries:c_c++
- Revert upstream change that set default python version and ignored user configuration. python-2059618.patch (boo#1006584) OBS-URL: https://build.opensuse.org/request/show/439200 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=180
This commit is contained in:
parent
3c8b85b5fa
commit
ba09852d23
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 8 13:32:31 UTC 2016 - adam.majer@suse.de
|
||||
|
||||
- Revert upstream change that set default python version and
|
||||
ignored user configuration.
|
||||
python-2059618.patch (boo#1006584)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 3 12:20:52 UTC 2016 - jengelh@inai.de
|
||||
|
||||
|
@ -101,6 +101,7 @@ Patch13: boost-visibility.patch
|
||||
Patch14: boost-1.57.0-python-libpython_dep.patch
|
||||
Patch15: boost-1.57.0-python-abi_letters.patch
|
||||
Patch16: boost-1.55.0-python-test-PyImport_AppendInittab.patch
|
||||
Patch17: python-2059618.patch
|
||||
Patch100: gcc_path.patch
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: dos2unix
|
||||
@ -482,6 +483,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
|
||||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
%patch100 -p1
|
||||
|
||||
#stupid build machinery copies .orig files
|
||||
|
28
python-2059618.patch
Normal file
28
python-2059618.patch
Normal file
@ -0,0 +1,28 @@
|
||||
Reverse: 2059618861eb25ae2ed3f1b6ebee8609365cbed9
|
||||
Bug: bnc#1006584
|
||||
https://svn.boost.org/trac/boost/ticket/12515
|
||||
|
||||
Index: boost_1_62_0/tools/build/src/tools/python.jam
|
||||
===================================================================
|
||||
--- boost_1_62_0.orig/tools/build/src/tools/python.jam
|
||||
+++ boost_1_62_0/tools/build/src/tools/python.jam
|
||||
@@ -903,19 +903,6 @@ local rule configure ( version ? : cmd-o
|
||||
toolset.add-requirements
|
||||
$(target-requirements:J=,):<python.interpreter>$(interpreter-cmd) ;
|
||||
|
||||
- # 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) ;
|
||||
- }
|
||||
-
|
||||
# Register the right suffix for extensions.
|
||||
register-extension-suffix $(extension-suffix) : $(target-requirements) ;
|
||||
|
Loading…
Reference in New Issue
Block a user