1 |
commit: c20cb316338c2ff06886c2addd0f015236cf96ac |
2 |
Author: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Feb 20 19:40:41 2019 +0000 |
4 |
Commit: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com> |
5 |
CommitDate: Wed Feb 20 19:43:24 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=c20cb316 |
7 |
|
8 |
dev-libs/boost: drop; fixed in the upstream and main tree |
9 |
|
10 |
Package-Manager: Portage-2.3.61, Repoman-2.3.12 |
11 |
Signed-off-by: Stefan Strogin <stefan.strogin <AT> gmail.com> |
12 |
|
13 |
dev-libs/boost/Manifest | 1 - |
14 |
dev-libs/boost/boost-1.63.0.ebuild | 441 --------------------- |
15 |
.../files/boost-1.48.0-disable_icu_rpath.patch | 29 -- |
16 |
.../boost-1.48.0-disable_libboost_python3.patch | 62 --- |
17 |
.../boost-1.48.0-no_strict_aliasing_python2.patch | 23 -- |
18 |
.../boost/files/boost-1.48.0-python_linking.patch | 24 -- |
19 |
.../boost-1.51.0-respect_python-buildid.patch | 69 ---- |
20 |
...ost-1.51.0-support_dots_in_python-buildid.patch | 22 - |
21 |
.../boost/files/boost-1.55.0-context-x32.patch | 42 -- |
22 |
.../files/boost-1.56.0-build-auto_index-tool.patch | 13 - |
23 |
.../boost/files/boost-1.62.0-asio-libressl.patch | 67 ---- |
24 |
dev-libs/boost/files/boost-1.63.0-fix-python.patch | 138 ------- |
25 |
dev-libs/boost/metadata.xml | 24 -- |
26 |
13 files changed, 955 deletions(-) |
27 |
|
28 |
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest |
29 |
deleted file mode 100644 |
30 |
index e3582a0..0000000 |
31 |
--- a/dev-libs/boost/Manifest |
32 |
+++ /dev/null |
33 |
@@ -1 +0,0 @@ |
34 |
-DIST boost_1_63_0.tar.bz2 81984414 SHA256 beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0 SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad WHIRLPOOL 28c241785097272a1e0952e529eef082444e4ef35a8d738161e4a491a986d75359d3afe888b2ea91a4a81b6ec7a5772ebea337c9d09377b43f6eed66cac90378 |
35 |
|
36 |
diff --git a/dev-libs/boost/boost-1.63.0.ebuild b/dev-libs/boost/boost-1.63.0.ebuild |
37 |
deleted file mode 100644 |
38 |
index 4f06bea..0000000 |
39 |
--- a/dev-libs/boost/boost-1.63.0.ebuild |
40 |
+++ /dev/null |
41 |
@@ -1,441 +0,0 @@ |
42 |
-# Copyright 1999-2017 Gentoo Foundation |
43 |
-# Distributed under the terms of the GNU General Public License v2 |
44 |
- |
45 |
-EAPI=6 |
46 |
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) |
47 |
- |
48 |
-inherit eutils flag-o-matic multiprocessing python-r1 toolchain-funcs versionator multilib-minimal |
49 |
- |
50 |
-MY_P="${PN}_$(replace_all_version_separators _)" |
51 |
-MAJOR_V="$(get_version_component_range 1-2)" |
52 |
- |
53 |
-DESCRIPTION="Boost Libraries for C++" |
54 |
-HOMEPAGE="http://www.boost.org/" |
55 |
-SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar.bz2" |
56 |
- |
57 |
-LICENSE="Boost-1.0" |
58 |
-SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122 |
59 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt" |
60 |
- |
61 |
-IUSE="context debug doc icu +nls mpi python static-libs +threads tools" |
62 |
- |
63 |
-RDEPEND="icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] ) |
64 |
- !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] ) |
65 |
- mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] ) |
66 |
- python? ( ${PYTHON_DEPS} ) |
67 |
- app-arch/bzip2[${MULTILIB_USEDEP}] |
68 |
- sys-libs/zlib[${MULTILIB_USEDEP}] |
69 |
- !app-admin/eselect-boost" |
70 |
-DEPEND="${RDEPEND} |
71 |
- =dev-util/boost-build-${MAJOR_V}*" |
72 |
-REQUIRED_USE=" |
73 |
- mpi? ( threads ) |
74 |
- python? ( ${PYTHON_REQUIRED_USE} )" |
75 |
- |
76 |
-S="${WORKDIR}/${MY_P}" |
77 |
- |
78 |
-# the tests will never fail because these are not intended as sanity |
79 |
-# tests at all. They are more a way for upstream to check their own code |
80 |
-# on new compilers. Since they would either be completely unreliable |
81 |
-# (failing for no good reason) or completely useless (never failing) |
82 |
-# there is no point in having them in the ebuild to begin with. |
83 |
-RESTRICT="test" |
84 |
- |
85 |
-PATCHES=( |
86 |
- "${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" |
87 |
- "${FILESDIR}/${PN}-1.55.0-context-x32.patch" |
88 |
- "${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch" |
89 |
- "${FILESDIR}/${PN}-1.62.0-asio-libressl.patch" |
90 |
- "${FILESDIR}/${PN}-1.63.0-fix-python.patch" |
91 |
-) |
92 |
- |
93 |
-python_bindings_needed() { |
94 |
- multilib_is_native_abi && use python |
95 |
-} |
96 |
- |
97 |
-tools_needed() { |
98 |
- multilib_is_native_abi && use tools |
99 |
-} |
100 |
- |
101 |
-create_user-config.jam() { |
102 |
- local compiler compiler_version compiler_executable |
103 |
- |
104 |
- if [[ ${CHOST} == *-darwin* ]]; then |
105 |
- compiler="darwin" |
106 |
- compiler_version="$(gcc-fullversion)" |
107 |
- compiler_executable="$(tc-getCXX)" |
108 |
- else |
109 |
- compiler="gcc" |
110 |
- compiler_version="$(gcc-version)" |
111 |
- compiler_executable="$(tc-getCXX)" |
112 |
- fi |
113 |
- local mpi_configuration python_configuration |
114 |
- |
115 |
- if use mpi; then |
116 |
- mpi_configuration="using mpi ;" |
117 |
- fi |
118 |
- |
119 |
- if python_bindings_needed; then |
120 |
- # boost expects libpython$(pyver) and doesn't allow overrides |
121 |
- # and the build system is so creepy that it's easier just to |
122 |
- # provide a symlink (linker's going to use SONAME anyway) |
123 |
- # TODO: replace it with proper override one day |
124 |
- ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die |
125 |
- |
126 |
- if tc-is-cross-compiler; then |
127 |
- python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;" |
128 |
- else |
129 |
- # note: we need to provide version explicitly because of |
130 |
- # a bug in the build system: |
131 |
- # https://github.com/boostorg/build/pull/104 |
132 |
- python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;" |
133 |
- fi |
134 |
- fi |
135 |
- |
136 |
- cat > "${BOOST_ROOT}/user-config.jam" << __EOF__ || die |
137 |
-using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ; |
138 |
-${mpi_configuration} |
139 |
-${python_configuration} |
140 |
-__EOF__ |
141 |
-} |
142 |
- |
143 |
-pkg_setup() { |
144 |
- # Bail out on unsupported build configuration, bug #456792 |
145 |
- if [[ -f "${EROOT%/}/etc/site-config.jam" ]]; then |
146 |
- grep -q gentoorelease "${EROOT%/}/etc/site-config.jam" && grep -q gentoodebug "${EROOT%/}/etc/site-config.jam" || |
147 |
- ( |
148 |
- eerror "You are using custom ${EROOT%/}/etc/site-config.jam without defined gentoorelease/gentoodebug targets." |
149 |
- eerror "Boost can not be built in such configuration." |
150 |
- eerror "Please, either remove this file or add targets from ${EROOT%/}/usr/share/boost-build/site-config.jam to it." |
151 |
- die |
152 |
- ) |
153 |
- fi |
154 |
-} |
155 |
- |
156 |
-src_prepare() { |
157 |
- default |
158 |
- |
159 |
- # Do not try to build missing 'wave' tool, bug #522682 |
160 |
- # Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507 |
161 |
- sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die |
162 |
- |
163 |
- multilib_copy_sources |
164 |
-} |
165 |
- |
166 |
-ejam() { |
167 |
- local b2_opts=( |
168 |
- "--user-config=${BOOST_ROOT}/user-config.jam" |
169 |
- "$@" |
170 |
- ) |
171 |
- echo b2 "${b2_opts[@]}" |
172 |
- b2 "${b2_opts[@]}" |
173 |
-} |
174 |
- |
175 |
-src_configure() { |
176 |
- # Workaround for too many parallel processes requested, bug #506064 |
177 |
- [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64" |
178 |
- |
179 |
- OPTIONS=( |
180 |
- $(usex debug gentoodebug gentoorelease) |
181 |
- "-j$(makeopts_jobs)" |
182 |
- -q |
183 |
- -d+2 |
184 |
- ) |
185 |
- |
186 |
- if [[ ${CHOST} == *-darwin* ]]; then |
187 |
- # We need to add the prefix, and in two cases this exceeds, so prepare |
188 |
- # for the largest possible space allocation. |
189 |
- append-ldflags -Wl,-headerpad_max_install_names |
190 |
- elif [[ ${CHOST} == *-winnt* ]]; then |
191 |
- compiler=parity |
192 |
- if [[ $($(tc-getCXX) -v) == *trunk* ]]; then |
193 |
- compilerVersion=trunk |
194 |
- else |
195 |
- compilerVersion=$($(tc-getCXX) -v | sed '1q' \ |
196 |
- | sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^ \t]*\) .*,\2,') |
197 |
- fi |
198 |
- compilerExecutable=$(tc-getCXX) |
199 |
- fi |
200 |
- |
201 |
- # bug 298489 |
202 |
- if use ppc || use ppc64; then |
203 |
- [[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec |
204 |
- fi |
205 |
- |
206 |
- # Use C++14 globally as of 1.62 |
207 |
- append-cxxflags -std=c++14 |
208 |
- |
209 |
- use icu && OPTIONS+=( |
210 |
- "-sICU_PATH=${EPREFIX}/usr" |
211 |
- ) |
212 |
- use icu || OPTIONS+=( |
213 |
- --disable-icu |
214 |
- boost.locale.icu=off |
215 |
- ) |
216 |
- use mpi || OPTIONS+=( |
217 |
- --without-mpi |
218 |
- ) |
219 |
- use nls || OPTIONS+=( |
220 |
- --without-locale |
221 |
- ) |
222 |
- use context || OPTIONS+=( |
223 |
- --without-context |
224 |
- --without-coroutine |
225 |
- --without-coroutine2 |
226 |
- --without-fiber |
227 |
- ) |
228 |
- use threads || OPTIONS+=( |
229 |
- --without-thread |
230 |
- ) |
231 |
- |
232 |
- OPTIONS+=( |
233 |
- pch=off |
234 |
- --boost-build="${EPREFIX}"/usr/share/boost-build |
235 |
- --prefix="${ED%/}/usr" |
236 |
- --layout=system |
237 |
- # building with threading=single is currently not possible |
238 |
- # https://svn.boost.org/trac/boost/ticket/7105 |
239 |
- threading=multi |
240 |
- link=$(usex static-libs shared,static shared) |
241 |
- ) |
242 |
- |
243 |
- [[ ${CHOST} == *-winnt* ]] && OPTIONS+=( |
244 |
- -sNO_BZIP2=1 |
245 |
- ) |
246 |
-} |
247 |
- |
248 |
-multilib_src_compile() { |
249 |
- local -x BOOST_ROOT="${BUILD_DIR}" |
250 |
- PYTHON_DIRS="" |
251 |
- MPI_PYTHON_MODULE="" |
252 |
- |
253 |
- building() { |
254 |
- create_user-config.jam |
255 |
- |
256 |
- local PYTHON_OPTIONS |
257 |
- if python_bindings_needed; then |
258 |
- PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}" |
259 |
- else |
260 |
- PYTHON_OPTIONS=" --without-python" |
261 |
- fi |
262 |
- |
263 |
- ejam \ |
264 |
- "${OPTIONS[@]}" \ |
265 |
- ${PYTHON_OPTIONS} \ |
266 |
- || die "Building of Boost libraries failed" |
267 |
- |
268 |
- if python_bindings_needed; then |
269 |
- if [[ -z "${PYTHON_DIRS}" ]]; then |
270 |
- PYTHON_DIRS="$(find bin.v2/libs -name python | sort)" |
271 |
- else |
272 |
- if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then |
273 |
- die "Inconsistent structure of build directories" |
274 |
- fi |
275 |
- fi |
276 |
- |
277 |
- local dir |
278 |
- for dir in ${PYTHON_DIRS}; do |
279 |
- mv ${dir} ${dir}-${EPYTHON} \ |
280 |
- || die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed" |
281 |
- done |
282 |
- |
283 |
- if use mpi; then |
284 |
- if [[ -z "${MPI_PYTHON_MODULE}" ]]; then |
285 |
- MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" |
286 |
- if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then |
287 |
- die "Multiple mpi.so files found" |
288 |
- fi |
289 |
- else |
290 |
- if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then |
291 |
- die "Inconsistent structure of build directories" |
292 |
- fi |
293 |
- fi |
294 |
- |
295 |
- mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON} \ |
296 |
- || die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${EPYTHON}' failed" |
297 |
- fi |
298 |
- fi |
299 |
- } |
300 |
- if python_bindings_needed; then |
301 |
- python_foreach_impl building |
302 |
- else |
303 |
- building |
304 |
- fi |
305 |
- |
306 |
- if tools_needed; then |
307 |
- pushd tools >/dev/null || die |
308 |
- |
309 |
- ejam \ |
310 |
- "${OPTIONS[@]}" \ |
311 |
- ${PYTHON_OPTIONS} \ |
312 |
- || die "Building of Boost tools failed" |
313 |
- popd >/dev/null || die |
314 |
- fi |
315 |
-} |
316 |
- |
317 |
-multilib_src_install_all() { |
318 |
- if ! use python; then |
319 |
- rm -r "${ED%/}"/usr/include/boost/python* || die |
320 |
- fi |
321 |
- |
322 |
- if ! use nls; then |
323 |
- rm -r "${ED%/}"/usr/include/boost/locale || die |
324 |
- fi |
325 |
- |
326 |
- if ! use context; then |
327 |
- rm -r "${ED%/}"/usr/include/boost/context || die |
328 |
- rm -r "${ED%/}"/usr/include/boost/coroutine{,2} || die |
329 |
- rm "${ED%/}"/usr/include/boost/asio/spawn.hpp || die |
330 |
- fi |
331 |
- |
332 |
- if use doc; then |
333 |
- # find extraneous files that shouldn't be installed |
334 |
- # as part of the documentation and remove them. |
335 |
- find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die |
336 |
- find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die |
337 |
- find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die |
338 |
- |
339 |
- docinto html |
340 |
- dodoc *.{htm,html,png,css} |
341 |
- dodoc -r doc libs more tools |
342 |
- |
343 |
- # To avoid broken links |
344 |
- dodoc LICENSE_1_0.txt |
345 |
- |
346 |
- dosym /usr/include/boost /usr/share/doc/${PF}/html/boost |
347 |
- fi |
348 |
-} |
349 |
- |
350 |
-multilib_src_install() { |
351 |
- local -x BOOST_ROOT="${BUILD_DIR}" |
352 |
- installation() { |
353 |
- create_user-config.jam |
354 |
- |
355 |
- local PYTHON_OPTIONS |
356 |
- if python_bindings_needed; then |
357 |
- local dir |
358 |
- for dir in ${PYTHON_DIRS}; do |
359 |
- cp -pr ${dir}-${EPYTHON} ${dir} \ |
360 |
- || die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed" |
361 |
- done |
362 |
- |
363 |
- if use mpi; then |
364 |
- cp -p stage/lib/mpi.so-${EPYTHON} "${MPI_PYTHON_MODULE}" \ |
365 |
- || die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed" |
366 |
- cp -p stage/lib/mpi.so-${EPYTHON} stage/lib/mpi.so \ |
367 |
- || die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed" |
368 |
- fi |
369 |
- PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}" |
370 |
- else |
371 |
- PYTHON_OPTIONS=" --without-python" |
372 |
- fi |
373 |
- |
374 |
- ejam \ |
375 |
- "${OPTIONS[@]}" \ |
376 |
- ${PYTHON_OPTIONS} \ |
377 |
- --includedir="${ED%/}/usr/include" \ |
378 |
- --libdir="${ED%/}/usr/$(get_libdir)" \ |
379 |
- install || die "Installation of Boost libraries failed" |
380 |
- |
381 |
- if python_bindings_needed; then |
382 |
- rm -r ${PYTHON_DIRS} || die |
383 |
- |
384 |
- # Move mpi.so Python module to Python site-packages directory. |
385 |
- # https://svn.boost.org/trac/boost/ticket/2838 |
386 |
- if use mpi; then |
387 |
- local moddir=$(python_get_sitedir)/boost |
388 |
- # moddir already includes eprefix |
389 |
- mkdir -p "${D}${moddir}" || die |
390 |
- mv "${ED%/}/usr/$(get_libdir)/mpi.so" "${D}${moddir}" || die |
391 |
- cat << EOF > "${D}${moddir}/__init__.py" || die |
392 |
-import sys |
393 |
-if sys.platform.startswith('linux'): |
394 |
- import DLFCN |
395 |
- flags = sys.getdlopenflags() |
396 |
- sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL) |
397 |
- from . import mpi |
398 |
- sys.setdlopenflags(flags) |
399 |
- del DLFCN, flags |
400 |
-else: |
401 |
- from . import mpi |
402 |
-del sys |
403 |
-EOF |
404 |
- fi |
405 |
- |
406 |
- python_optimize |
407 |
- fi |
408 |
- } |
409 |
- if python_bindings_needed; then |
410 |
- python_foreach_impl installation |
411 |
- else |
412 |
- installation |
413 |
- fi |
414 |
- |
415 |
- pushd "${ED%/}/usr/$(get_libdir)" >/dev/null || die |
416 |
- |
417 |
- local ext=$(get_libname) |
418 |
- if use threads; then |
419 |
- local f |
420 |
- for f in *${ext}; do |
421 |
- dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}} |
422 |
- done |
423 |
- fi |
424 |
- |
425 |
- popd >/dev/null || die |
426 |
- |
427 |
- if tools_needed; then |
428 |
- dobin dist/bin/* |
429 |
- |
430 |
- insinto /usr/share |
431 |
- doins -r dist/share/boostbook |
432 |
- fi |
433 |
- |
434 |
- # boost's build system truely sucks for not having a destdir. Because for |
435 |
- # this reason we are forced to build with a prefix that includes the |
436 |
- # DESTROOT, dynamic libraries on Darwin end messed up, referencing the |
437 |
- # DESTROOT instread of the actual EPREFIX. There is no way out of here |
438 |
- # but to do it the dirty way of manually setting the right install_names. |
439 |
- if [[ ${CHOST} == *-darwin* ]]; then |
440 |
- einfo "Working around completely broken build-system(tm)" |
441 |
- local d |
442 |
- for d in "${ED%/}"/usr/lib/*.dylib; do |
443 |
- if [[ -f ${d} ]]; then |
444 |
- # fix the "soname" |
445 |
- ebegin " correcting install_name of ${d#${ED}}" |
446 |
- install_name_tool -id "/${d#${D}}" "${d}" |
447 |
- eend $? |
448 |
- # fix references to other libs |
449 |
- refs=$(otool -XL "${d}" | \ |
450 |
- sed -e '1d' -e 's/^\t//' | \ |
451 |
- grep "^libboost_" | \ |
452 |
- cut -f1 -d' ') |
453 |
- local r |
454 |
- for r in ${refs}; do |
455 |
- ebegin " correcting reference to ${r}" |
456 |
- install_name_tool -change \ |
457 |
- "${r}" \ |
458 |
- "${EPREFIX}/usr/lib/${r}" \ |
459 |
- "${d}" |
460 |
- eend $? |
461 |
- done |
462 |
- fi |
463 |
- done |
464 |
- fi |
465 |
-} |
466 |
- |
467 |
-pkg_preinst() { |
468 |
- # Yai for having symlinks that are nigh-impossible to remove without |
469 |
- # resorting to dirty hacks like these. Removes lingering symlinks |
470 |
- # from the slotted versions. |
471 |
- local symlink |
472 |
- for symlink in "${EROOT%/}/usr/include/boost" "${EROOT%/}/usr/share/boostbook"; do |
473 |
- if [[ -L ${symlink} ]]; then |
474 |
- rm -f "${symlink}" || die |
475 |
- fi |
476 |
- done |
477 |
- |
478 |
- # some ancient installs still have boost cruft lying around |
479 |
- # for unknown reasons, causing havoc for reverse dependencies |
480 |
- # Bug: 607734 |
481 |
- rm -rf "${EROOT%/}"/usr/include/boost-1_[3-5]? || die |
482 |
-} |
483 |
|
484 |
diff --git a/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch b/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch |
485 |
deleted file mode 100644 |
486 |
index 23a8783..0000000 |
487 |
--- a/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch |
488 |
+++ /dev/null |
489 |
@@ -1,29 +0,0 @@ |
490 |
---- a/libs/locale/build/Jamfile.v2 |
491 |
-+++ b/libs/locale/build/Jamfile.v2 |
492 |
-@@ -58,8 +58,8 @@ |
493 |
- |
494 |
- if $(ICU_LINK) |
495 |
- { |
496 |
-- ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <runtime-link>shared ; |
497 |
-- ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin64 <runtime-link>shared ; |
498 |
-+ ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ; |
499 |
-+ ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ; |
500 |
- } |
501 |
- else |
502 |
- { |
503 |
-@@ -117,7 +117,6 @@ |
504 |
- <library>icuuc/<link>shared/<runtime-link>shared |
505 |
- <library>icudt/<link>shared/<runtime-link>shared |
506 |
- <library>icuin/<link>shared/<runtime-link>shared |
507 |
-- <dll-path>$(ICU_PATH)/bin |
508 |
- <runtime-link>shared ; |
509 |
- |
510 |
- |
511 |
-@@ -176,7 +175,6 @@ |
512 |
- <library>icuuc_64/<link>shared/<runtime-link>shared |
513 |
- <library>icudt_64/<link>shared/<runtime-link>shared |
514 |
- <library>icuin_64/<link>shared/<runtime-link>shared |
515 |
-- <dll-path>$(ICU_PATH)/bin64 |
516 |
- <runtime-link>shared ; |
517 |
- |
518 |
- |
519 |
|
520 |
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 |
521 |
deleted file mode 100644 |
522 |
index d456040..0000000 |
523 |
--- a/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch |
524 |
+++ /dev/null |
525 |
@@ -1,62 +0,0 @@ |
526 |
---- a/libs/python/build/Jamfile.v2 |
527 |
-+++ b/libs/python/build/Jamfile.v2 |
528 |
-@@ -39,23 +39,6 @@ |
529 |
- PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" "_" ] ; |
530 |
- } |
531 |
- |
532 |
-- |
533 |
--rule find-py3-version |
534 |
--{ |
535 |
-- local versions = [ feature.values python ] ; |
536 |
-- local py3ver ; |
537 |
-- for local v in $(versions) |
538 |
-- { |
539 |
-- if $(v) >= 3.0 |
540 |
-- { |
541 |
-- py3ver = $(v) ; |
542 |
-- } |
543 |
-- } |
544 |
-- return $(py3ver) ; |
545 |
--} |
546 |
-- |
547 |
--py3-version = [ find-py3-version ] ; |
548 |
-- |
549 |
- project boost/python |
550 |
- : source-location ../src |
551 |
- : requirements |
552 |
-@@ -82,7 +65,7 @@ |
553 |
- rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } } |
554 |
- rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } } |
555 |
- |
556 |
--rule lib_boost_python ( is-py3 ? ) |
557 |
-+rule lib_boost_python |
558 |
- { |
559 |
- |
560 |
- local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ; |
561 |
-@@ -91,7 +74,7 @@ |
562 |
- { |
563 |
- python2 = true ; |
564 |
- } |
565 |
-- lib [ cond $(is-py3) : boost_python3 : boost_python ] |
566 |
-+ lib boost_python |
567 |
- : # sources |
568 |
- numeric.cpp |
569 |
- list.cpp |
570 |
-@@ -148,7 +131,6 @@ |
571 |
- <dependency>config-warning |
572 |
- |
573 |
- <python-debugging>on:<define>BOOST_DEBUG_PYTHON |
574 |
-- [ cond $(is-py3) : <python>$(py3-version) ] |
575 |
- : # default build |
576 |
- <link>shared |
577 |
- : # usage requirements |
578 |
-@@ -160,9 +142,3 @@ |
579 |
- |
580 |
- lib_boost_python ; |
581 |
- boost-install boost_python ; |
582 |
-- |
583 |
--if $(py3-version) |
584 |
--{ |
585 |
-- lib_boost_python yes ; |
586 |
-- boost-install boost_python3 ; |
587 |
--} |
588 |
|
589 |
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 |
590 |
deleted file mode 100644 |
591 |
index cb26792..0000000 |
592 |
--- a/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch |
593 |
+++ /dev/null |
594 |
@@ -1,23 +0,0 @@ |
595 |
---- a/libs/python/build/Jamfile.v2 |
596 |
-+++ b/libs/python/build/Jamfile.v2 |
597 |
-@@ -85,6 +85,12 @@ |
598 |
- rule lib_boost_python ( is-py3 ? ) |
599 |
- { |
600 |
- |
601 |
-+ local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ; |
602 |
-+ local python2 ; |
603 |
-+ if $(python_major_version) = 2 |
604 |
-+ { |
605 |
-+ python2 = true ; |
606 |
-+ } |
607 |
- lib [ cond $(is-py3) : boost_python3 : boost_python ] |
608 |
- : # sources |
609 |
- numeric.cpp |
610 |
-@@ -119,6 +125,7 @@ |
611 |
- : # requirements |
612 |
- <link>static:<define>BOOST_PYTHON_STATIC_LIB |
613 |
- <define>BOOST_PYTHON_SOURCE |
614 |
-+ [ cond $(python2) : <cxxflags>-fno-strict-aliasing ] |
615 |
- |
616 |
- # On Windows, all code using Python has to link to the Python |
617 |
- # import library. |
618 |
|
619 |
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 |
620 |
deleted file mode 100644 |
621 |
index 330cbb1..0000000 |
622 |
--- a/dev-libs/boost/files/boost-1.48.0-python_linking.patch |
623 |
+++ /dev/null |
624 |
@@ -1,24 +0,0 @@ |
625 |
---- a/libs/python/build/Jamfile.v2 |
626 |
-+++ b/libs/python/build/Jamfile.v2 |
627 |
-@@ -109,20 +109,7 @@ |
628 |
- <link>static:<define>BOOST_PYTHON_STATIC_LIB |
629 |
- <define>BOOST_PYTHON_SOURCE |
630 |
- [ cond $(python2) : <cxxflags>-fno-strict-aliasing ] |
631 |
-- |
632 |
-- # On Windows, all code using Python has to link to the Python |
633 |
-- # import library. |
634 |
-- # |
635 |
-- # On *nix we never link libboost_python to libpython. When |
636 |
-- # extending Python, all Python symbols are provided by the |
637 |
-- # Python interpreter executable. When embedding Python, the |
638 |
-- # client executable is expected to explicitly link to |
639 |
-- # /python//python (the target representing libpython) itself. |
640 |
-- # |
641 |
-- # python_for_extensions is a target defined by Boost.Build to |
642 |
-- # provide the Python include paths, and on Windows, the Python |
643 |
-- # import library, as usage requirements. |
644 |
-- [ cond [ python.configured ] : <library>/python//python_for_extensions ] |
645 |
-+ [ cond [ python.configured ] : <library>/python//python ] |
646 |
- |
647 |
- # we prevent building when there is no python available |
648 |
- # as it's not possible anyway, and to cause dependents to |
649 |
|
650 |
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 |
651 |
deleted file mode 100644 |
652 |
index 17a6816..0000000 |
653 |
--- a/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch |
654 |
+++ /dev/null |
655 |
@@ -1,69 +0,0 @@ |
656 |
-https://svn.boost.org/trac/boost/ticket/6286 |
657 |
- |
658 |
---- a/boostcpp.jam |
659 |
-+++ b/boostcpp.jam |
660 |
-@@ -99,13 +99,6 @@ |
661 |
- BUILD_ID = [ regex.replace $(build-id) "[*\\/:.\"\' ]" _ ] ; |
662 |
- } |
663 |
- |
664 |
--# Python build id (for Python libraries only). |
665 |
--python-id = [ option.get "python-buildid" ] ; |
666 |
--if $(python-id) |
667 |
--{ |
668 |
-- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; |
669 |
--} |
670 |
-- |
671 |
- |
672 |
- ################################################################################ |
673 |
- # |
674 |
---- a/libs/mpi/build/Jamfile.v2 |
675 |
-+++ b/libs/mpi/build/Jamfile.v2 |
676 |
-@@ -8,6 +8,8 @@ |
677 |
- # Authors: Douglas Gregor |
678 |
- # Andrew Lumsdaine |
679 |
- |
680 |
-+import option ; |
681 |
-+import regex ; |
682 |
- import mpi ; |
683 |
- import indirect ; |
684 |
- import python ; |
685 |
-@@ -24,6 +26,13 @@ |
686 |
- <tag>@$(__name__).tag |
687 |
- ; |
688 |
- |
689 |
-+# Python build id (for Python libraries only). |
690 |
-+python-id = [ option.get "python-buildid" ] ; |
691 |
-+if $(python-id) |
692 |
-+{ |
693 |
-+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; |
694 |
-+} |
695 |
-+ |
696 |
- rule tag ( name : type ? : property-set ) |
697 |
- { |
698 |
- local result = $(name) ; |
699 |
---- a/libs/python/build/Jamfile.v2 |
700 |
-+++ b/libs/python/build/Jamfile.v2 |
701 |
-@@ -2,6 +2,8 @@ |
702 |
- # Software License, Version 1.0. (See accompanying |
703 |
- # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
704 |
- |
705 |
-+import option ; |
706 |
-+import regex ; |
707 |
- import os ; |
708 |
- import indirect ; |
709 |
- import modules ; |
710 |
-@@ -30,6 +32,14 @@ |
711 |
- ; |
712 |
- } |
713 |
- |
714 |
-+# Python build id (for Python libraries only). |
715 |
-+python-id = [ option.get "python-buildid" ] ; |
716 |
-+if $(python-id) |
717 |
-+{ |
718 |
-+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; |
719 |
-+} |
720 |
-+ |
721 |
-+ |
722 |
- rule find-py3-version |
723 |
- { |
724 |
- local versions = [ feature.values python ] ; |
725 |
|
726 |
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 |
727 |
deleted file mode 100644 |
728 |
index a8912eb..0000000 |
729 |
--- a/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch |
730 |
+++ /dev/null |
731 |
@@ -1,22 +0,0 @@ |
732 |
---- a/libs/mpi/build/Jamfile.v2 |
733 |
-+++ b/libs/mpi/build/Jamfile.v2 |
734 |
-@@ -30,7 +30,7 @@ |
735 |
- python-id = [ option.get "python-buildid" ] ; |
736 |
- if $(python-id) |
737 |
- { |
738 |
-- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; |
739 |
-+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ; |
740 |
- } |
741 |
- |
742 |
- rule tag ( name : type ? : property-set ) |
743 |
---- a/libs/python/build/Jamfile.v2 |
744 |
-+++ b/libs/python/build/Jamfile.v2 |
745 |
-@@ -36,7 +36,7 @@ |
746 |
- python-id = [ option.get "python-buildid" ] ; |
747 |
- if $(python-id) |
748 |
- { |
749 |
-- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; |
750 |
-+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ; |
751 |
- } |
752 |
- |
753 |
- |
754 |
|
755 |
diff --git a/dev-libs/boost/files/boost-1.55.0-context-x32.patch b/dev-libs/boost/files/boost-1.55.0-context-x32.patch |
756 |
deleted file mode 100644 |
757 |
index 5bf7406..0000000 |
758 |
--- a/dev-libs/boost/files/boost-1.55.0-context-x32.patch |
759 |
+++ /dev/null |
760 |
@@ -1,42 +0,0 @@ |
761 |
-https://svn.boost.org/trac/boost/ticket/9445 |
762 |
- |
763 |
-hack to fix x32 builds |
764 |
- |
765 |
---- a/libs/context/src/asm/jump_i386_sysv_elf_gas.S |
766 |
-+++ b/libs/context/src/asm/jump_i386_sysv_elf_gas.S |
767 |
-@@ -31,6 +31,10 @@ |
768 |
- * * |
769 |
- * *****************************************************************/ |
770 |
- |
771 |
-+#ifdef __x86_64__ |
772 |
-+#include "jump_x86_64_sysv_elf_gas.S" |
773 |
-+#else |
774 |
-+ |
775 |
- .text |
776 |
- .globl jump_fcontext |
777 |
- .align 2 |
778 |
-@@ -73,3 +77,5 @@ jump_fcontext: |
779 |
- |
780 |
- /* Mark that we don't need executable stack. */ |
781 |
- .section .note.GNU-stack,"",%progbits |
782 |
-+ |
783 |
-+#endif |
784 |
---- a/libs/context/src/asm/make_i386_sysv_elf_gas.S |
785 |
-+++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S |
786 |
-@@ -31,6 +31,10 @@ |
787 |
- * * |
788 |
- * *****************************************************************/ |
789 |
- |
790 |
-+#ifdef __x86_64__ |
791 |
-+#include "make_x86_64_sysv_elf_gas.S" |
792 |
-+#else |
793 |
-+ |
794 |
- .text |
795 |
- .globl make_fcontext |
796 |
- .align 2 |
797 |
-@@ -78,3 +82,5 @@ finish: |
798 |
- |
799 |
- /* Mark that we don't need executable stack. */ |
800 |
- .section .note.GNU-stack,"",%progbits |
801 |
-+ |
802 |
-+#endif |
803 |
|
804 |
diff --git a/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch b/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch |
805 |
deleted file mode 100644 |
806 |
index 48ca513..0000000 |
807 |
--- a/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch |
808 |
+++ /dev/null |
809 |
@@ -1,13 +0,0 @@ |
810 |
-Build auto_index tool with USE="tools" |
811 |
-Gentoo bug report: https://bugs.gentoo.org/show_bug.cgi?id=529066 |
812 |
- |
813 |
---- a/tools/Jamfile.v2.orig 2014-12-24 12:57:32.290880067 +0300 |
814 |
-+++ b/tools/Jamfile.v2 2014-12-24 12:58:38.403883250 +0300 |
815 |
-@@ -20,6 +20,7 @@ |
816 |
- use-project /boost/regression : regression/build ; |
817 |
- |
818 |
- TOOLS = |
819 |
-+ auto_index/build//auto_index |
820 |
- bcp//bcp |
821 |
- inspect/build//inspect |
822 |
- quickbook//quickbook |
823 |
|
824 |
diff --git a/dev-libs/boost/files/boost-1.62.0-asio-libressl.patch b/dev-libs/boost/files/boost-1.62.0-asio-libressl.patch |
825 |
deleted file mode 100644 |
826 |
index 00caf13..0000000 |
827 |
--- a/dev-libs/boost/files/boost-1.62.0-asio-libressl.patch |
828 |
+++ /dev/null |
829 |
@@ -1,67 +0,0 @@ |
830 |
-From 4808f72a1f524873f351acff8fda0d0d17acfca5 Mon Sep 17 00:00:00 2001 |
831 |
-From: Christopher Kohlhoff <chris@××××××××.com> |
832 |
-Date: Sun, 5 Mar 2017 22:47:57 +1100 |
833 |
-Subject: [PATCH] Re-enable building against LibreSSL. |
834 |
- |
835 |
---- |
836 |
- boost/asio/ssl/impl/context.ipp | 12 ++++++------ |
837 |
- 1 file changed, 6 insertions(+), 6 deletions(-) |
838 |
- |
839 |
-diff --git a/boost/asio/ssl/impl/context.ipp b/boost/asio/ssl/impl/context.ipp |
840 |
-index 4667575..c8c5f43 100644 |
841 |
---- a/boost/asio/ssl/impl/context.ipp |
842 |
-+++ b/boost/asio/ssl/impl/context.ipp |
843 |
-@@ -228,7 +228,7 @@ context::~context() |
844 |
- { |
845 |
- if (handle_) |
846 |
- { |
847 |
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) |
848 |
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) |
849 |
- void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); |
850 |
- #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) |
851 |
- void* cb_userdata = handle_->default_passwd_callback_userdata; |
852 |
-@@ -239,7 +239,7 @@ context::~context() |
853 |
- static_cast<detail::password_callback_base*>( |
854 |
- cb_userdata); |
855 |
- delete callback; |
856 |
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) |
857 |
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) |
858 |
- ::SSL_CTX_set_default_passwd_cb_userdata(handle_, 0); |
859 |
- #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) |
860 |
- handle_->default_passwd_callback_userdata = 0; |
861 |
-@@ -578,7 +578,7 @@ boost::system::error_code context::use_certificate_chain( |
862 |
- bio_cleanup bio = { make_buffer_bio(chain) }; |
863 |
- if (bio.p) |
864 |
- { |
865 |
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) |
866 |
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) |
867 |
- pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); |
868 |
- void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); |
869 |
- #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) |
870 |
-@@ -682,7 +682,7 @@ boost::system::error_code context::use_private_key( |
871 |
- { |
872 |
- ::ERR_clear_error(); |
873 |
- |
874 |
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) |
875 |
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) |
876 |
- pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); |
877 |
- void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); |
878 |
- #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) |
879 |
-@@ -749,7 +749,7 @@ boost::system::error_code context::use_rsa_private_key( |
880 |
- { |
881 |
- ::ERR_clear_error(); |
882 |
- |
883 |
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) |
884 |
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) |
885 |
- pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); |
886 |
- void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); |
887 |
- #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) |
888 |
-@@ -988,7 +988,7 @@ int context::verify_callback_function(int preverified, X509_STORE_CTX* ctx) |
889 |
- boost::system::error_code context::do_set_password_callback( |
890 |
- detail::password_callback_base* callback, boost::system::error_code& ec) |
891 |
- { |
892 |
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) |
893 |
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) |
894 |
- void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); |
895 |
- ::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback); |
896 |
- #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) |
897 |
|
898 |
diff --git a/dev-libs/boost/files/boost-1.63.0-fix-python.patch b/dev-libs/boost/files/boost-1.63.0-fix-python.patch |
899 |
deleted file mode 100644 |
900 |
index 18ca2f5..0000000 |
901 |
--- a/dev-libs/boost/files/boost-1.63.0-fix-python.patch |
902 |
+++ /dev/null |
903 |
@@ -1,138 +0,0 @@ |
904 |
---- a/boostcpp.jam |
905 |
-+++ b/boostcpp.jam |
906 |
-@@ -104,7 +104,7 @@ |
907 |
- python-id = [ option.get "python-buildid" ] ; |
908 |
- if $(python-id) |
909 |
- { |
910 |
-- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; |
911 |
-+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ; |
912 |
- } |
913 |
- |
914 |
- |
915 |
---- a/libs/python/build/Jamfile |
916 |
-+++ b/libs/python/build/Jamfile |
917 |
-@@ -30,22 +30,6 @@ |
918 |
- ; |
919 |
- } |
920 |
- |
921 |
--rule find-py3-version |
922 |
--{ |
923 |
-- local versions = [ feature.values python ] ; |
924 |
-- local py3ver ; |
925 |
-- for local v in $(versions) |
926 |
-- { |
927 |
-- if $(v) >= 3.0 |
928 |
-- { |
929 |
-- py3ver = $(v) ; |
930 |
-- } |
931 |
-- } |
932 |
-- return $(py3ver) ; |
933 |
--} |
934 |
-- |
935 |
--py3-version = [ find-py3-version ] ; |
936 |
-- |
937 |
- project boost/python |
938 |
- : source-location ../src |
939 |
- ; |
940 |
-@@ -53,10 +37,16 @@ |
941 |
- rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } } |
942 |
- rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } } |
943 |
- |
944 |
--rule lib_boost_python ( is-py3 ? ) |
945 |
-+rule lib_boost_python |
946 |
- { |
947 |
-+ local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ; |
948 |
-+ local python2 ; |
949 |
-+ if $(python_major_version) = 2 |
950 |
-+ { |
951 |
-+ python2 = true ; |
952 |
-+ } |
953 |
- |
954 |
-- lib [ cond $(is-py3) : boost_python3 : boost_python ] |
955 |
-+ lib boost_python |
956 |
- : # sources |
957 |
- numeric.cpp |
958 |
- list.cpp |
959 |
-@@ -90,20 +80,9 @@ |
960 |
- : # requirements |
961 |
- <link>static:<define>BOOST_PYTHON_STATIC_LIB |
962 |
- <define>BOOST_PYTHON_SOURCE |
963 |
-+ [ cond $(python2) : <cxxflags>-fno-strict-aliasing ] |
964 |
- |
965 |
-- # On Windows, all code using Python has to link to the Python |
966 |
-- # import library. |
967 |
-- # |
968 |
-- # On *nix we never link libboost_python to libpython. When |
969 |
-- # extending Python, all Python symbols are provided by the |
970 |
-- # Python interpreter executable. When embedding Python, the |
971 |
-- # client executable is expected to explicitly link to |
972 |
-- # /python//python (the target representing libpython) itself. |
973 |
-- # |
974 |
-- # python_for_extensions is a target defined by Boost.Build to |
975 |
-- # provide the Python include paths, and on Windows, the Python |
976 |
-- # import library, as usage requirements. |
977 |
-- [ cond [ python.configured ] : <library>/python//python_for_extensions ] |
978 |
-+ [ cond [ python.configured ] : <library>/python//python ] |
979 |
- |
980 |
- # we prevent building when there is no python available |
981 |
- # as it's not possible anyway, and to cause dependents to |
982 |
-@@ -112,7 +91,6 @@ |
983 |
- <dependency>config-warning |
984 |
- |
985 |
- <python-debugging>on:<define>BOOST_DEBUG_PYTHON |
986 |
-- [ cond $(is-py3) : <python>$(py3-version) ] |
987 |
- |
988 |
- -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag |
989 |
- <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag |
990 |
-@@ -125,51 +103,8 @@ |
991 |
- ; |
992 |
- } |
993 |
- |
994 |
--rule lib_boost_numpy ( is-py3 ? ) |
995 |
--{ |
996 |
-- numpy-include = [ python.numpy-include ] ; |
997 |
-- lib [ cond $(is-py3) : boost_numpy3 : boost_numpy ] |
998 |
-- : # sources |
999 |
-- numpy/dtype.cpp |
1000 |
-- numpy/matrix.cpp |
1001 |
-- numpy/ndarray.cpp |
1002 |
-- numpy/numpy.cpp |
1003 |
-- numpy/scalars.cpp |
1004 |
-- numpy/ufunc.cpp |
1005 |
-- : # requirements |
1006 |
-- [ cond [ python.numpy ] : <library>/python//python_for_extensions ] |
1007 |
-- [ unless [ python.numpy ] : <build>no ] |
1008 |
-- <include>$(numpy-include) |
1009 |
-- <library>boost_python |
1010 |
-- <python-debugging>on:<define>BOOST_DEBUG_PYTHON |
1011 |
-- [ cond $(is-py3) : <python>$(py3-version) ] |
1012 |
-- |
1013 |
-- -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag |
1014 |
-- <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag |
1015 |
-- |
1016 |
-- : # default build |
1017 |
-- <link>shared |
1018 |
-- : # usage requirements |
1019 |
-- <python-debugging>on:<define>BOOST_DEBUG_PYTHON |
1020 |
-- ; |
1021 |
--} |
1022 |
-- |
1023 |
- libraries = boost_python ; |
1024 |
--libraries3 = boost_python3 ; |
1025 |
--if [ python.numpy ] |
1026 |
--{ |
1027 |
-- libraries += boost_numpy ; |
1028 |
-- libraries3 += boost_numpy3 ; |
1029 |
--} |
1030 |
- |
1031 |
- lib_boost_python ; |
1032 |
--lib_boost_numpy ; |
1033 |
-- |
1034 |
--if $(py3-version) |
1035 |
--{ |
1036 |
-- lib_boost_python yes ; |
1037 |
-- lib_boost_numpy yes ; |
1038 |
-- libraries += $(libraries3) ; |
1039 |
--} |
1040 |
- |
1041 |
- boost-install $(libraries) ; |
1042 |
|
1043 |
diff --git a/dev-libs/boost/metadata.xml b/dev-libs/boost/metadata.xml |
1044 |
deleted file mode 100644 |
1045 |
index 4f85afb..0000000 |
1046 |
--- a/dev-libs/boost/metadata.xml |
1047 |
+++ /dev/null |
1048 |
@@ -1,24 +0,0 @@ |
1049 |
-<?xml version="1.0" encoding="UTF-8"?> |
1050 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1051 |
-<pkgmetadata> |
1052 |
- <maintainer type="project"> |
1053 |
- <email>cpp@g.o</email> |
1054 |
- <name>Gentoo C++ Project</name> |
1055 |
- </maintainer> |
1056 |
- <maintainer type="project"> |
1057 |
- <email>office@g.o</email> |
1058 |
- <description>Please CC on stabilisation bugs</description> |
1059 |
- </maintainer> |
1060 |
- <use> |
1061 |
- <flag name="context">Build and install the Boost.Context (and Boost.Fiber) library and all other Boost libraries that depend on it</flag> |
1062 |
- <flag name="tools">Build and install the boost tools (bcp, quickbook, inspect, wave)</flag> |
1063 |
- <flag name="debug" restrict="<dev-libs/boost-1.50.0-r3">Build and install debug versions of the Boost libraries. These libraries are not used by default, and should not be used unless you're developing against Boost.</flag> |
1064 |
- <flag name="debug" restrict=">dev-libs/boost-1.52.0-r2">Build and install only the debug version of the Boost libraries. Only enable this flag if you're developing against boost.</flag> |
1065 |
- <flag name="threads">Build multi-thread-compatible libraries instead of single-threaded only.</flag> |
1066 |
- <flag name="nls">Build libboost_locale. This library requires compatible C library interfaces, which might not be provided by uClibc or other embedded libraries.</flag> |
1067 |
- <flag name="doc">Install the full API documentation documentation. This takes over 200MB of extra disk space.</flag> |
1068 |
- </use> |
1069 |
- <upstream> |
1070 |
- <remote-id type="sourceforge">boost</remote-id> |
1071 |
- </upstream> |
1072 |
-</pkgmetadata> |