1 |
commit: 19367bd30d2b6d0e9b96b3b782456d2c6ba7b6e4 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Feb 1 17:09:36 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 1 17:41:13 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19367bd3 |
7 |
|
8 |
dev-libs/boost: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/7017 |
11 |
|
12 |
.../boost-1.48.0-disable_libboost_python3.patch | 62 ------------------- |
13 |
.../boost-1.48.0-no_strict_aliasing_python2.patch | 23 -------- |
14 |
.../boost/files/boost-1.48.0-python_linking.patch | 24 -------- |
15 |
.../boost-1.51.0-respect_python-buildid.patch | 69 ---------------------- |
16 |
...ost-1.51.0-support_dots_in_python-buildid.patch | 22 ------- |
17 |
5 files changed, 200 deletions(-) |
18 |
|
19 |
diff --git a/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch b/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch |
20 |
deleted file mode 100644 |
21 |
index d4560400d7d..00000000000 |
22 |
--- a/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch |
23 |
+++ /dev/null |
24 |
@@ -1,62 +0,0 @@ |
25 |
---- a/libs/python/build/Jamfile.v2 |
26 |
-+++ b/libs/python/build/Jamfile.v2 |
27 |
-@@ -39,23 +39,6 @@ |
28 |
- PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" "_" ] ; |
29 |
- } |
30 |
- |
31 |
-- |
32 |
--rule find-py3-version |
33 |
--{ |
34 |
-- local versions = [ feature.values python ] ; |
35 |
-- local py3ver ; |
36 |
-- for local v in $(versions) |
37 |
-- { |
38 |
-- if $(v) >= 3.0 |
39 |
-- { |
40 |
-- py3ver = $(v) ; |
41 |
-- } |
42 |
-- } |
43 |
-- return $(py3ver) ; |
44 |
--} |
45 |
-- |
46 |
--py3-version = [ find-py3-version ] ; |
47 |
-- |
48 |
- project boost/python |
49 |
- : source-location ../src |
50 |
- : requirements |
51 |
-@@ -82,7 +65,7 @@ |
52 |
- rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } } |
53 |
- rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } } |
54 |
- |
55 |
--rule lib_boost_python ( is-py3 ? ) |
56 |
-+rule lib_boost_python |
57 |
- { |
58 |
- |
59 |
- local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ; |
60 |
-@@ -91,7 +74,7 @@ |
61 |
- { |
62 |
- python2 = true ; |
63 |
- } |
64 |
-- lib [ cond $(is-py3) : boost_python3 : boost_python ] |
65 |
-+ lib boost_python |
66 |
- : # sources |
67 |
- numeric.cpp |
68 |
- list.cpp |
69 |
-@@ -148,7 +131,6 @@ |
70 |
- <dependency>config-warning |
71 |
- |
72 |
- <python-debugging>on:<define>BOOST_DEBUG_PYTHON |
73 |
-- [ cond $(is-py3) : <python>$(py3-version) ] |
74 |
- : # default build |
75 |
- <link>shared |
76 |
- : # usage requirements |
77 |
-@@ -160,9 +142,3 @@ |
78 |
- |
79 |
- lib_boost_python ; |
80 |
- boost-install boost_python ; |
81 |
-- |
82 |
--if $(py3-version) |
83 |
--{ |
84 |
-- lib_boost_python yes ; |
85 |
-- boost-install boost_python3 ; |
86 |
--} |
87 |
|
88 |
diff --git a/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch b/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch |
89 |
deleted file mode 100644 |
90 |
index cb26792f99c..00000000000 |
91 |
--- a/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch |
92 |
+++ /dev/null |
93 |
@@ -1,23 +0,0 @@ |
94 |
---- a/libs/python/build/Jamfile.v2 |
95 |
-+++ b/libs/python/build/Jamfile.v2 |
96 |
-@@ -85,6 +85,12 @@ |
97 |
- rule lib_boost_python ( is-py3 ? ) |
98 |
- { |
99 |
- |
100 |
-+ local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ; |
101 |
-+ local python2 ; |
102 |
-+ if $(python_major_version) = 2 |
103 |
-+ { |
104 |
-+ python2 = true ; |
105 |
-+ } |
106 |
- lib [ cond $(is-py3) : boost_python3 : boost_python ] |
107 |
- : # sources |
108 |
- numeric.cpp |
109 |
-@@ -119,6 +125,7 @@ |
110 |
- : # requirements |
111 |
- <link>static:<define>BOOST_PYTHON_STATIC_LIB |
112 |
- <define>BOOST_PYTHON_SOURCE |
113 |
-+ [ cond $(python2) : <cxxflags>-fno-strict-aliasing ] |
114 |
- |
115 |
- # On Windows, all code using Python has to link to the Python |
116 |
- # import library. |
117 |
|
118 |
diff --git a/dev-libs/boost/files/boost-1.48.0-python_linking.patch b/dev-libs/boost/files/boost-1.48.0-python_linking.patch |
119 |
deleted file mode 100644 |
120 |
index 330cbb11e88..00000000000 |
121 |
--- a/dev-libs/boost/files/boost-1.48.0-python_linking.patch |
122 |
+++ /dev/null |
123 |
@@ -1,24 +0,0 @@ |
124 |
---- a/libs/python/build/Jamfile.v2 |
125 |
-+++ b/libs/python/build/Jamfile.v2 |
126 |
-@@ -109,20 +109,7 @@ |
127 |
- <link>static:<define>BOOST_PYTHON_STATIC_LIB |
128 |
- <define>BOOST_PYTHON_SOURCE |
129 |
- [ cond $(python2) : <cxxflags>-fno-strict-aliasing ] |
130 |
-- |
131 |
-- # On Windows, all code using Python has to link to the Python |
132 |
-- # import library. |
133 |
-- # |
134 |
-- # On *nix we never link libboost_python to libpython. When |
135 |
-- # extending Python, all Python symbols are provided by the |
136 |
-- # Python interpreter executable. When embedding Python, the |
137 |
-- # client executable is expected to explicitly link to |
138 |
-- # /python//python (the target representing libpython) itself. |
139 |
-- # |
140 |
-- # python_for_extensions is a target defined by Boost.Build to |
141 |
-- # provide the Python include paths, and on Windows, the Python |
142 |
-- # import library, as usage requirements. |
143 |
-- [ cond [ python.configured ] : <library>/python//python_for_extensions ] |
144 |
-+ [ cond [ python.configured ] : <library>/python//python ] |
145 |
- |
146 |
- # we prevent building when there is no python available |
147 |
- # as it's not possible anyway, and to cause dependents to |
148 |
|
149 |
diff --git a/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch b/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch |
150 |
deleted file mode 100644 |
151 |
index 17a681611b6..00000000000 |
152 |
--- a/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch |
153 |
+++ /dev/null |
154 |
@@ -1,69 +0,0 @@ |
155 |
-https://svn.boost.org/trac/boost/ticket/6286 |
156 |
- |
157 |
---- a/boostcpp.jam |
158 |
-+++ b/boostcpp.jam |
159 |
-@@ -99,13 +99,6 @@ |
160 |
- BUILD_ID = [ regex.replace $(build-id) "[*\\/:.\"\' ]" _ ] ; |
161 |
- } |
162 |
- |
163 |
--# Python build id (for Python libraries only). |
164 |
--python-id = [ option.get "python-buildid" ] ; |
165 |
--if $(python-id) |
166 |
--{ |
167 |
-- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; |
168 |
--} |
169 |
-- |
170 |
- |
171 |
- ################################################################################ |
172 |
- # |
173 |
---- a/libs/mpi/build/Jamfile.v2 |
174 |
-+++ b/libs/mpi/build/Jamfile.v2 |
175 |
-@@ -8,6 +8,8 @@ |
176 |
- # Authors: Douglas Gregor |
177 |
- # Andrew Lumsdaine |
178 |
- |
179 |
-+import option ; |
180 |
-+import regex ; |
181 |
- import mpi ; |
182 |
- import indirect ; |
183 |
- import python ; |
184 |
-@@ -24,6 +26,13 @@ |
185 |
- <tag>@$(__name__).tag |
186 |
- ; |
187 |
- |
188 |
-+# Python build id (for Python libraries only). |
189 |
-+python-id = [ option.get "python-buildid" ] ; |
190 |
-+if $(python-id) |
191 |
-+{ |
192 |
-+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; |
193 |
-+} |
194 |
-+ |
195 |
- rule tag ( name : type ? : property-set ) |
196 |
- { |
197 |
- local result = $(name) ; |
198 |
---- a/libs/python/build/Jamfile.v2 |
199 |
-+++ b/libs/python/build/Jamfile.v2 |
200 |
-@@ -2,6 +2,8 @@ |
201 |
- # Software License, Version 1.0. (See accompanying |
202 |
- # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
203 |
- |
204 |
-+import option ; |
205 |
-+import regex ; |
206 |
- import os ; |
207 |
- import indirect ; |
208 |
- import modules ; |
209 |
-@@ -30,6 +32,14 @@ |
210 |
- ; |
211 |
- } |
212 |
- |
213 |
-+# Python build id (for Python libraries only). |
214 |
-+python-id = [ option.get "python-buildid" ] ; |
215 |
-+if $(python-id) |
216 |
-+{ |
217 |
-+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; |
218 |
-+} |
219 |
-+ |
220 |
-+ |
221 |
- rule find-py3-version |
222 |
- { |
223 |
- local versions = [ feature.values python ] ; |
224 |
|
225 |
diff --git a/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch b/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch |
226 |
deleted file mode 100644 |
227 |
index a8912eb5e04..00000000000 |
228 |
--- a/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch |
229 |
+++ /dev/null |
230 |
@@ -1,22 +0,0 @@ |
231 |
---- a/libs/mpi/build/Jamfile.v2 |
232 |
-+++ b/libs/mpi/build/Jamfile.v2 |
233 |
-@@ -30,7 +30,7 @@ |
234 |
- python-id = [ option.get "python-buildid" ] ; |
235 |
- if $(python-id) |
236 |
- { |
237 |
-- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; |
238 |
-+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ; |
239 |
- } |
240 |
- |
241 |
- rule tag ( name : type ? : property-set ) |
242 |
---- a/libs/python/build/Jamfile.v2 |
243 |
-+++ b/libs/python/build/Jamfile.v2 |
244 |
-@@ -36,7 +36,7 @@ |
245 |
- python-id = [ option.get "python-buildid" ] ; |
246 |
- if $(python-id) |
247 |
- { |
248 |
-- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; |
249 |
-+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ; |
250 |
- } |
251 |
- |
252 |
- |