]> git.ipfire.org Git - people/pmueller/ipfire-3.x.git/blob - boost/patches/boost-1.57.0-python-abi_letters.patch
Merge remote-tracking branch 'stevee/master'
[people/pmueller/ipfire-3.x.git] / boost / patches / boost-1.57.0-python-abi_letters.patch
1 --- boost_1_57_0/tools/build/src/tools/python.jam 2013-05-21 06:14:18.000000000 +0200
2 +++ boost_1_55_0/tools/build/src/tools/python.jam 2014-05-29 19:09:12.115413877 +0200
3 @@ -94,7 +94,7 @@ feature.feature pythonpath : : free opti
4 # using python : 2.3 : /usr/local/bin/python ;
5 #
6 rule init ( version ? : cmd-or-prefix ? : includes * : libraries ?
7 - : condition * : extension-suffix ? )
8 + : condition * : extension-suffix ? : abi-letters ? )
9 {
10 project.push-current $(.project) ;
11
12 @@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ?
13 }
14 }
15
16 - configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) ;
17 + configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) : $(abi-letters) ;
18
19 project.pop-current ;
20 }
21 @@ -653,7 +653,7 @@ local rule system-library-dependencies (
22
23 # Declare a target to represent Python's library.
24 #
25 -local rule declare-libpython-target ( version ? : requirements * )
26 +local rule declare-libpython-target ( version ? : requirements * : abi-letters ? )
27 {
28 # Compute the representation of Python version in the name of Python's
29 # library file.
30 @@ -677,13 +677,13 @@ local rule declare-libpython-target ( ve
31 }
32
33 # Declare it.
34 - lib python.lib : : <name>python$(lib-version) $(requirements) ;
35 + lib python.lib : : <name>python$(lib-version)$(abi-letters) $(requirements) ;
36 }
37
38
39 # Implementation of init.
40 local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
41 - condition * : extension-suffix ? )
42 + condition * : extension-suffix ? : abi-letters ? )
43 {
44 local prefix ;
45 local exec-prefix ;
46 @@ -699,6 +699,7 @@ local rule configure ( version ? : cmd-o
47 extension-suffix ?= _d ;
48 }
49 extension-suffix ?= "" ;
50 + abi-letters ?= "" ;
51
52 # Normalize and dissect any version number.
53 local major-minor ;
54 @@ -922,7 +923,7 @@ local rule configure ( version ? : cmd-o
55 }
56 else
57 {
58 - declare-libpython-target $(version) : $(target-requirements) ;
59 + declare-libpython-target $(version) : $(target-requirements) : $(abi-letters) ;
60
61 # This is an evil hack. On, Windows, when Python is embedded, nothing
62 # seems to set up sys.path to include Python's standard library