1 |
commit: ce923a91650ce8028c00387c4a37524773ec3d21 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 24 22:12:34 2020 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 24 22:14:35 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce923a91 |
7 |
|
8 |
dev-libs/boost: Remove old |
9 |
|
10 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
11 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
12 |
|
13 |
dev-libs/boost/Manifest | 1 - |
14 |
dev-libs/boost/boost-1.72.0-r2.ebuild | 358 --------------------- |
15 |
.../files/boost-1.72.0-boost-mpi-python.patch | 50 --- |
16 |
...issing-serialization-split_member-include.patch | 29 -- |
17 |
...t-1.72.0-revert-cease-dependence-on-range.patch | 49 --- |
18 |
5 files changed, 487 deletions(-) |
19 |
|
20 |
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest |
21 |
index c833789b410..205dbe8592a 100644 |
22 |
--- a/dev-libs/boost/Manifest |
23 |
+++ b/dev-libs/boost/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6 |
26 |
DIST boost_1_74_0.tar.bz2 109600630 BLAKE2B 2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63 SHA512 4ec9c1164ec9b95ce46ba1c073e586c94b3882dce5b7347ea14bbef0c1da230e12aa5328a501ce38cae1b1d7623daa3246325625899179b4cc309242540982a4 |
27 |
|
28 |
diff --git a/dev-libs/boost/boost-1.72.0-r2.ebuild b/dev-libs/boost/boost-1.72.0-r2.ebuild |
29 |
deleted file mode 100644 |
30 |
index 2556d26576e..00000000000 |
31 |
--- a/dev-libs/boost/boost-1.72.0-r2.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,358 +0,0 @@ |
34 |
-# Copyright 1999-2020 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
- |
39 |
-PYTHON_COMPAT=( python3_{6,7,8} ) |
40 |
- |
41 |
-inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal |
42 |
- |
43 |
-MY_PV="$(ver_rs 1- _)" |
44 |
-MAJOR_V="$(ver_cut 1-2)" |
45 |
- |
46 |
-DESCRIPTION="Boost Libraries for C++" |
47 |
-HOMEPAGE="https://www.boost.org/" |
48 |
-SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2" |
49 |
- |
50 |
-LICENSE="Boost-1.0" |
51 |
-SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122 |
52 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt" |
53 |
-IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd" |
54 |
-REQUIRED_USE=" |
55 |
- mpi? ( threads ) |
56 |
- python? ( ${PYTHON_REQUIRED_USE} )" |
57 |
- |
58 |
-# the tests will never fail because these are not intended as sanity |
59 |
-# tests at all. They are more a way for upstream to check their own code |
60 |
-# on new compilers. Since they would either be completely unreliable |
61 |
-# (failing for no good reason) or completely useless (never failing) |
62 |
-# there is no point in having them in the ebuild to begin with. |
63 |
-RESTRICT="test" |
64 |
- |
65 |
-RDEPEND=" |
66 |
- !app-admin/eselect-boost |
67 |
- !dev-libs/boost-numpy |
68 |
- bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] ) |
69 |
- icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] ) |
70 |
- !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] ) |
71 |
- lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] ) |
72 |
- mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] ) |
73 |
- python? ( |
74 |
- ${PYTHON_DEPS} |
75 |
- numpy? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' -3) ) |
76 |
- ) |
77 |
- zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] ) |
78 |
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" |
79 |
-DEPEND="${RDEPEND}" |
80 |
-BDEPEND="=dev-util/boost-build-${MAJOR_V}*" |
81 |
- |
82 |
-S="${WORKDIR}/${PN}_${MY_PV}" |
83 |
- |
84 |
-PATCHES=( |
85 |
- "${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch |
86 |
- "${FILESDIR}"/${PN}-1.71.0-context-x32.patch |
87 |
- "${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch |
88 |
- # Bug 703294, incomplete Boost.Serialization refactoring |
89 |
- "${FILESDIR}"/${PN}-1.72.0-missing-serialization-split_member-include.patch |
90 |
- # Bug 703036, per python-impl Boost.MPI |
91 |
- "${FILESDIR}"/${PN}-1.72.0-boost-mpi-python.patch |
92 |
- # Bug 704128, missing include on Boost.Ranges |
93 |
- "${FILESDIR}"/${PN}-1.72.0-revert-cease-dependence-on-range.patch |
94 |
-) |
95 |
- |
96 |
-python_bindings_needed() { |
97 |
- multilib_is_native_abi && use python |
98 |
-} |
99 |
- |
100 |
-tools_needed() { |
101 |
- multilib_is_native_abi && use tools |
102 |
-} |
103 |
- |
104 |
-create_user-config.jam() { |
105 |
- local user_config_jam="${BUILD_DIR}"/user-config.jam |
106 |
- if [[ -s ${user_config_jam} ]]; then |
107 |
- einfo "${user_config_jam} already exists, skipping configuration" |
108 |
- return |
109 |
- else |
110 |
- einfo "Creating configuration in ${user_config_jam}" |
111 |
- fi |
112 |
- |
113 |
- local compiler compiler_version compiler_executable="$(tc-getCXX)" |
114 |
- if [[ ${CHOST} == *-darwin* ]]; then |
115 |
- compiler="darwin" |
116 |
- compiler_version="$(gcc-fullversion)" |
117 |
- else |
118 |
- compiler="gcc" |
119 |
- compiler_version="$(gcc-version)" |
120 |
- fi |
121 |
- |
122 |
- if use mpi; then |
123 |
- local mpi_configuration="using mpi ;" |
124 |
- fi |
125 |
- |
126 |
- cat > "${user_config_jam}" <<- __EOF__ || die |
127 |
- using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ; |
128 |
- ${mpi_configuration} |
129 |
- __EOF__ |
130 |
- |
131 |
- if python_bindings_needed; then |
132 |
- append_to_user_config() { |
133 |
- local py_config |
134 |
- if tc-is-cross-compiler; then |
135 |
- py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;" |
136 |
- else |
137 |
- py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;" |
138 |
- fi |
139 |
- echo "${py_config}" >> "${user_config_jam}" || die |
140 |
- } |
141 |
- python_foreach_impl append_to_user_config |
142 |
- fi |
143 |
- |
144 |
- if python_bindings_needed && use numpy; then |
145 |
- einfo "Enabling support for NumPy extensions in Boost.Python" |
146 |
- else |
147 |
- einfo "Disabling support for NumPy extensions in Boost.Python" |
148 |
- |
149 |
- # Boost.Build does not allow for disabling of numpy |
150 |
- # extensions, thereby leading to automagic numpy |
151 |
- # https://github.com/boostorg/python/issues/111#issuecomment-280447482 |
152 |
- sed \ |
153 |
- -e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \ |
154 |
- -i "${BUILD_DIR}"/libs/python/build/Jamfile || die |
155 |
- fi |
156 |
-} |
157 |
- |
158 |
-pkg_setup() { |
159 |
- # Bail out on unsupported build configuration, bug #456792 |
160 |
- if [[ -f "${EROOT}"/etc/site-config.jam ]]; then |
161 |
- if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then |
162 |
- eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets." |
163 |
- eerror "Boost can not be built in such configuration." |
164 |
- eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it." |
165 |
- die "Unsupported target in ${EROOT}/etc/site-config.jam" |
166 |
- fi |
167 |
- fi |
168 |
-} |
169 |
- |
170 |
-src_prepare() { |
171 |
- default |
172 |
- multilib_copy_sources |
173 |
-} |
174 |
- |
175 |
-ejam() { |
176 |
- create_user-config.jam |
177 |
- |
178 |
- local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" ) |
179 |
- if python_bindings_needed; then |
180 |
- append_to_b2_opts() { |
181 |
- b2_opts+=( python="${EPYTHON#python}" ) |
182 |
- } |
183 |
- python_foreach_impl append_to_b2_opts |
184 |
- else |
185 |
- b2_opts+=( --without-python ) |
186 |
- fi |
187 |
- b2_opts+=( "$@" ) |
188 |
- |
189 |
- echo b2 "${b2_opts[@]}" >&2 |
190 |
- b2 "${b2_opts[@]}" |
191 |
-} |
192 |
- |
193 |
-src_configure() { |
194 |
- # Workaround for too many parallel processes requested, bug #506064 |
195 |
- [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64" |
196 |
- |
197 |
- OPTIONS=( |
198 |
- $(usex debug gentoodebug gentoorelease) |
199 |
- "-j$(makeopts_jobs)" |
200 |
- -q |
201 |
- -d+2 |
202 |
- pch=off |
203 |
- $(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off') |
204 |
- $(usex mpi '' '--without-mpi') |
205 |
- $(usex nls '' '--without-locale') |
206 |
- $(usex context '' '--without-context --without-coroutine --without-fiber') |
207 |
- $(usex threads '' '--without-thread') |
208 |
- --without-stacktrace |
209 |
- --boost-build="${BROOT}"/usr/share/boost-build |
210 |
- --prefix="${ED}/usr" |
211 |
- --layout=system |
212 |
- # CMake has issues working with multiple python impls, |
213 |
- # disable cmake config generation for the time being |
214 |
- # https://github.com/boostorg/python/issues/262#issuecomment-483069294 |
215 |
- --no-cmake-config |
216 |
- # building with threading=single is currently not possible |
217 |
- # https://svn.boost.org/trac/boost/ticket/7105 |
218 |
- threading=multi |
219 |
- link=$(usex static-libs shared,static shared) |
220 |
- # this seems to be the only way to disable compression algorithms |
221 |
- # https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build |
222 |
- -sNO_BZIP2=$(usex bzip2 0 1) |
223 |
- -sNO_LZMA=$(usex lzma 0 1) |
224 |
- -sNO_ZLIB=$(usex zlib 0 1) |
225 |
- -sNO_ZSTD=$(usex zstd 0 1) |
226 |
- ) |
227 |
- |
228 |
- if [[ ${CHOST} == *-darwin* ]]; then |
229 |
- # We need to add the prefix, and in two cases this exceeds, so prepare |
230 |
- # for the largest possible space allocation. |
231 |
- append-ldflags -Wl,-headerpad_max_install_names |
232 |
- fi |
233 |
- |
234 |
- # Use C++14 globally as of 1.62 |
235 |
- append-cxxflags -std=c++14 |
236 |
-} |
237 |
- |
238 |
-multilib_src_compile() { |
239 |
- ejam "${OPTIONS[@]}" || die |
240 |
- |
241 |
- if tools_needed; then |
242 |
- pushd tools >/dev/null || die |
243 |
- ejam \ |
244 |
- "${OPTIONS[@]}" \ |
245 |
- || die "Building of Boost tools failed" |
246 |
- popd >/dev/null || die |
247 |
- fi |
248 |
-} |
249 |
- |
250 |
-multilib_src_install_all() { |
251 |
- if ! use numpy; then |
252 |
- rm -r "${ED}"/usr/include/boost/python/numpy* || die |
253 |
- fi |
254 |
- |
255 |
- if use python; then |
256 |
- if use mpi; then |
257 |
- move_mpi_py_into_sitedir() { |
258 |
- local pyver="${EPYTHON#python}" |
259 |
- python_moduleinto boost |
260 |
- python_domodule "${ED}"/usr/$(get_libdir)/mpi${pyver/./}.so |
261 |
- rm "${ED}"/usr/$(get_libdir)/mpi${pyver/./}* || die |
262 |
- dosym mpi${pyver/./}.so $(python_get_sitedir)/boost/mpi.so |
263 |
- |
264 |
- # create a proper python package |
265 |
- touch "${D}"/$(python_get_sitedir)/boost/__init__.py || die |
266 |
- python_optimize |
267 |
- } |
268 |
- python_foreach_impl move_mpi_py_into_sitedir |
269 |
- else |
270 |
- rm -r "${ED}"/usr/include/boost/mpi/python* || die |
271 |
- fi |
272 |
- else |
273 |
- rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die |
274 |
- fi |
275 |
- |
276 |
- if ! use nls; then |
277 |
- rm -r "${ED}"/usr/include/boost/locale || die |
278 |
- fi |
279 |
- |
280 |
- if ! use context; then |
281 |
- rm -r "${ED}"/usr/include/boost/context || die |
282 |
- rm -r "${ED}"/usr/include/boost/coroutine{,2} || die |
283 |
- rm "${ED}"/usr/include/boost/asio/spawn.hpp || die |
284 |
- fi |
285 |
- |
286 |
- if use doc; then |
287 |
- # find extraneous files that shouldn't be installed |
288 |
- # as part of the documentation and remove them. |
289 |
- find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die |
290 |
- find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die |
291 |
- find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die |
292 |
- |
293 |
- docinto html |
294 |
- dodoc *.{htm,html,png,css} |
295 |
- dodoc -r doc libs more tools |
296 |
- |
297 |
- # To avoid broken links |
298 |
- dodoc LICENSE_1_0.txt |
299 |
- |
300 |
- dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost |
301 |
- fi |
302 |
-} |
303 |
- |
304 |
-multilib_src_install() { |
305 |
- ejam \ |
306 |
- "${OPTIONS[@]}" \ |
307 |
- --includedir="${ED}/usr/include" \ |
308 |
- --libdir="${ED}/usr/$(get_libdir)" \ |
309 |
- install || die "Installation of Boost libraries failed" |
310 |
- |
311 |
- pushd "${ED}/usr/$(get_libdir)" >/dev/null || die |
312 |
- |
313 |
- local ext=$(get_libname) |
314 |
- if use threads; then |
315 |
- local f |
316 |
- for f in *${ext}; do |
317 |
- dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}} |
318 |
- done |
319 |
- fi |
320 |
- |
321 |
- popd >/dev/null || die |
322 |
- |
323 |
- if tools_needed; then |
324 |
- dobin dist/bin/* |
325 |
- |
326 |
- insinto /usr/share |
327 |
- doins -r dist/share/boostbook |
328 |
- fi |
329 |
- |
330 |
- # boost's build system truely sucks for not having a destdir. Because for |
331 |
- # this reason we are forced to build with a prefix that includes the |
332 |
- # DESTROOT, dynamic libraries on Darwin end messed up, referencing the |
333 |
- # DESTROOT instread of the actual EPREFIX. There is no way out of here |
334 |
- # but to do it the dirty way of manually setting the right install_names. |
335 |
- if [[ ${CHOST} == *-darwin* ]]; then |
336 |
- einfo "Working around completely broken build-system(tm)" |
337 |
- local d |
338 |
- for d in "${ED}"/usr/lib/*.dylib; do |
339 |
- if [[ -f ${d} ]]; then |
340 |
- # fix the "soname" |
341 |
- ebegin " correcting install_name of ${d#${ED}}" |
342 |
- install_name_tool -id "/${d#${D}}" "${d}" |
343 |
- eend $? |
344 |
- # fix references to other libs |
345 |
- refs=$(otool -XL "${d}" | \ |
346 |
- sed -e '1d' -e 's/^\t//' | \ |
347 |
- grep "^libboost_" | \ |
348 |
- cut -f1 -d' ') |
349 |
- local r |
350 |
- for r in ${refs}; do |
351 |
- ebegin " correcting reference to ${r}" |
352 |
- install_name_tool -change \ |
353 |
- "${r}" \ |
354 |
- "${EPREFIX}/usr/lib/${r}" \ |
355 |
- "${d}" |
356 |
- eend $? |
357 |
- done |
358 |
- fi |
359 |
- done |
360 |
- fi |
361 |
-} |
362 |
- |
363 |
-pkg_preinst() { |
364 |
- # Yai for having symlinks that are nigh-impossible to remove without |
365 |
- # resorting to dirty hacks like these. Removes lingering symlinks |
366 |
- # from the slotted versions. |
367 |
- local symlink |
368 |
- for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do |
369 |
- if [[ -L ${symlink} ]]; then |
370 |
- rm -f "${symlink}" || die |
371 |
- fi |
372 |
- done |
373 |
- |
374 |
- # some ancient installs still have boost cruft lying around |
375 |
- # for unknown reasons, causing havoc for reverse dependencies |
376 |
- # Bug: 607734 |
377 |
- rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die |
378 |
-} |
379 |
- |
380 |
-pkg_postinst() { |
381 |
- elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as" |
382 |
- elog |
383 |
- elog " undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation" |
384 |
- elog " <char>::transform_primary[abi:cxx11](char const*, char const*) const'" |
385 |
- elog |
386 |
- elog "Then you need to recompile Boost and all its reverse dependencies" |
387 |
- elog "using the same toolchain. In general, *every* change of the C++ toolchain" |
388 |
- elog "requires a complete rebuild of the boost-dependent ecosystem." |
389 |
- elog |
390 |
- elog "See for instance https://bugs.gentoo.org/638138" |
391 |
-} |
392 |
|
393 |
diff --git a/dev-libs/boost/files/boost-1.72.0-boost-mpi-python.patch b/dev-libs/boost/files/boost-1.72.0-boost-mpi-python.patch |
394 |
deleted file mode 100644 |
395 |
index 8fb164a6278..00000000000 |
396 |
--- a/dev-libs/boost/files/boost-1.72.0-boost-mpi-python.patch |
397 |
+++ /dev/null |
398 |
@@ -1,50 +0,0 @@ |
399 |
-Tag Boost.MPI python impls properly to avoid name clash |
400 |
-https://github.com/boostorg/mpi/issues/112 |
401 |
- |
402 |
---- a/boostcpp.jam |
403 |
-+++ b/boostcpp.jam |
404 |
-@@ -185,7 +185,7 @@ |
405 |
- |
406 |
- rule tag ( name : type ? : property-set ) |
407 |
- { |
408 |
-- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB |
409 |
-+ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION |
410 |
- { |
411 |
- local args = $(.format-name-args) ; |
412 |
- if $(layout) = versioned |
413 |
-@@ -223,7 +223,7 @@ |
414 |
- { |
415 |
- local result = $(name) ; |
416 |
- |
417 |
-- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB |
418 |
-+ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION |
419 |
- { |
420 |
- # Add Python version suffix |
421 |
- |
422 |
---- a/libs/mpi/build/Jamfile.v2 |
423 |
-+++ b/libs/mpi/build/Jamfile.v2 |
424 |
-@@ -58,13 +58,13 @@ |
425 |
- rule python-tag ( name : type ? : property-set ) |
426 |
- { |
427 |
- local result = $(name) ; |
428 |
-- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB |
429 |
-+ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION |
430 |
- { |
431 |
- local version = [ $(property-set).get <python> ] ; |
432 |
- local lib-suffix = [ version-suffix $(version) ] ; |
433 |
- result = $(result)$(lib-suffix) ; |
434 |
- } |
435 |
-- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB && $(PYTHON_ID) |
436 |
-+ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION && $(PYTHON_ID) |
437 |
- { |
438 |
- result = $(result)-$(PYTHON_ID) ; |
439 |
- } |
440 |
-@@ -168,6 +168,8 @@ |
441 |
- <link>shared:<define>BOOST_PYTHON_DYN_LINK=1 |
442 |
- <link>shared <runtime-link>shared |
443 |
- <python-debugging>on:<define>BOOST_DEBUG_PYTHON |
444 |
-+ -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag |
445 |
-+ <tag>@$(__name__).python-tag |
446 |
- ; |
447 |
- |
448 |
- mpi_python_libs = boost_mpi_python mpi ; |
449 |
|
450 |
diff --git a/dev-libs/boost/files/boost-1.72.0-missing-serialization-split_member-include.patch b/dev-libs/boost/files/boost-1.72.0-missing-serialization-split_member-include.patch |
451 |
deleted file mode 100644 |
452 |
index 0c9f72583ef..00000000000 |
453 |
--- a/dev-libs/boost/files/boost-1.72.0-missing-serialization-split_member-include.patch |
454 |
+++ /dev/null |
455 |
@@ -1,29 +0,0 @@ |
456 |
-Missing #include, as the split_member.hpp include is not |
457 |
-part of the nvp.hpp interface, and hence cannot be relied |
458 |
-upon to be included transitively. |
459 |
- |
460 |
-Confirmed on |
461 |
-https://github.com/boostorg/serialization/commit/c32a663c9963385430abc563f9c85f94d8da43a9#r36528430 |
462 |
- |
463 |
-Bug: https://bugs.gentoo.org/703294 |
464 |
- |
465 |
---- a/boost/bimap/detail/map_view_iterator.hpp |
466 |
-+++ b/boost/bimap/detail/map_view_iterator.hpp |
467 |
-@@ -22,6 +22,7 @@ |
468 |
- |
469 |
- #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION |
470 |
- #include <boost/serialization/nvp.hpp> |
471 |
-+ #include <boost/serialization/split_member.hpp> |
472 |
- #endif // BOOST_BIMAP_DISABLE_SERIALIZATION |
473 |
- |
474 |
- #include <boost/iterator/detail/enable_if.hpp> |
475 |
---- a/boost/bimap/detail/set_view_iterator.hpp |
476 |
-+++ b/boost/bimap/detail/set_view_iterator.hpp |
477 |
-@@ -22,6 +22,7 @@ |
478 |
- |
479 |
- #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION |
480 |
- #include <boost/serialization/nvp.hpp> |
481 |
-+ #include <boost/serialization/split_member.hpp> |
482 |
- #endif // BOOST_BIMAP_DISABLE_SERIALIZATION |
483 |
- |
484 |
- #include <boost/iterator/detail/enable_if.hpp> |
485 |
|
486 |
diff --git a/dev-libs/boost/files/boost-1.72.0-revert-cease-dependence-on-range.patch b/dev-libs/boost/files/boost-1.72.0-revert-cease-dependence-on-range.patch |
487 |
deleted file mode 100644 |
488 |
index a6002074ab9..00000000000 |
489 |
--- a/dev-libs/boost/files/boost-1.72.0-revert-cease-dependence-on-range.patch |
490 |
+++ /dev/null |
491 |
@@ -1,49 +0,0 @@ |
492 |
-From 436e1dbe6fcd31523d261d18ad011392f1d6fbbc Mon Sep 17 00:00:00 2001 |
493 |
-From: Oliver Kowalke <oliver.kowalke@×××××.com> |
494 |
-Date: Sun, 1 Dec 2019 20:40:28 +0100 |
495 |
-Subject: [PATCH] Revert "Cease dependence on Range" |
496 |
- |
497 |
-This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db. |
498 |
- |
499 |
-see #44 (One test fails to compile after boostorg/coroutine submodule updated) |
500 |
---- |
501 |
- boost/coroutine/asymmetric_coroutine.hpp | 12 +++--------- |
502 |
- 1 file changed, 3 insertions(+), 9 deletions(-) |
503 |
- |
504 |
-diff --git a/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp |
505 |
-index ea96981..640896f 100644 |
506 |
---- a/boost/coroutine/asymmetric_coroutine.hpp |
507 |
-+++ b/boost/coroutine/asymmetric_coroutine.hpp |
508 |
-@@ -14,6 +14,7 @@ |
509 |
- #include <boost/assert.hpp> |
510 |
- #include <boost/config.hpp> |
511 |
- #include <boost/move/move.hpp> |
512 |
-+#include <boost/range.hpp> |
513 |
- #include <boost/throw_exception.hpp> |
514 |
- #include <boost/utility/explicit_operator_bool.hpp> |
515 |
- |
516 |
-@@ -2354,19 +2355,12 @@ end( push_coroutine< R > & c) |
517 |
- |
518 |
- } |
519 |
- |
520 |
--// forward declaration of Boost.Range traits to break dependency on it |
521 |
--template<typename C, typename Enabler> |
522 |
--struct range_mutable_iterator; |
523 |
-- |
524 |
--template<typename C, typename Enabler> |
525 |
--struct range_const_iterator; |
526 |
-- |
527 |
- template< typename Arg > |
528 |
--struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void > |
529 |
-+struct range_mutable_iterator< coroutines::push_coroutine< Arg > > |
530 |
- { typedef typename coroutines::push_coroutine< Arg >::iterator type; }; |
531 |
- |
532 |
- template< typename R > |
533 |
--struct range_mutable_iterator< coroutines::pull_coroutine< R >, void > |
534 |
-+struct range_mutable_iterator< coroutines::pull_coroutine< R > > |
535 |
- { typedef typename coroutines::pull_coroutine< R >::iterator type; }; |
536 |
- |
537 |
- } |
538 |
--- |
539 |
-2.24.1 |
540 |
- |