1 |
commit: 46049201dc0bc9503ca0fa3bfcb70e927e4d468d |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 10 13:41:19 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 11 17:07:13 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46049201 |
7 |
|
8 |
dev-libs/boost: Drop 1.62.0 for real |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
dev-libs/boost/Manifest | 1 - |
13 |
dev-libs/boost/boost-1.62.0-r1.ebuild | 444 --------------------- |
14 |
.../boost-1.48.0-disable_libboost_python3.patch | 62 --- |
15 |
.../boost-1.48.0-no_strict_aliasing_python2.patch | 23 -- |
16 |
.../boost/files/boost-1.48.0-python_linking.patch | 24 -- |
17 |
.../boost-1.51.0-respect_python-buildid.patch | 69 ---- |
18 |
...ost-1.51.0-support_dots_in_python-buildid.patch | 22 - |
19 |
7 files changed, 645 deletions(-) |
20 |
|
21 |
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest |
22 |
index 89aea014074..c81be6cd8e0 100644 |
23 |
--- a/dev-libs/boost/Manifest |
24 |
+++ b/dev-libs/boost/Manifest |
25 |
@@ -1,3 +1,2 @@ |
26 |
-DIST boost_1_62_0.tar.bz2 84513338 BLAKE2B 00f2ddf93d254183709a5e607d5cec5d135bdcddebac15fc3b1522e37b9e58d8df84f1977fee5b085309db58634861f2014e72822e755dd7789e8489fef19f7c SHA512 5385ae3d5255a433a704169ad454d8dc2b0b5bcae3fb23defd6570df4ff7d845cf9fcbeebccdc1c5db0eec9f82ee3d90040de9507c8167467c635d3b215463be |
27 |
DIST boost_1_63_0.tar.bz2 81984414 BLAKE2B 227c4432bd3ca0eb390048ec85047958fcb6ae289996501812cd8b13bf74bbe9b677d0110948265cab59a60deb36c4fc08440af74ac5a5219ea4eaea4fa6918f SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad |
28 |
DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd |
29 |
|
30 |
diff --git a/dev-libs/boost/boost-1.62.0-r1.ebuild b/dev-libs/boost/boost-1.62.0-r1.ebuild |
31 |
deleted file mode 100644 |
32 |
index 7ee2ada110d..00000000000 |
33 |
--- a/dev-libs/boost/boost-1.62.0-r1.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,444 +0,0 @@ |
36 |
-# Copyright 1999-2018 Gentoo Foundation |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=6 |
40 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
41 |
- |
42 |
-inherit eutils flag-o-matic multiprocessing python-r1 toolchain-funcs versionator multilib-minimal |
43 |
- |
44 |
-MY_P="${PN}_$(replace_all_version_separators _)" |
45 |
-MAJOR_V="$(get_version_component_range 1-2)" |
46 |
- |
47 |
-DESCRIPTION="Boost Libraries for C++" |
48 |
-HOMEPAGE="http://www.boost.org/" |
49 |
-SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar.bz2" |
50 |
- |
51 |
-LICENSE="Boost-1.0" |
52 |
-SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122 |
53 |
-KEYWORDS="hppa" |
54 |
- |
55 |
-IUSE="context debug doc icu +nls mpi python static-libs +threads tools" |
56 |
- |
57 |
-RDEPEND="icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] ) |
58 |
- !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] ) |
59 |
- mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] ) |
60 |
- python? ( ${PYTHON_DEPS} ) |
61 |
- app-arch/bzip2[${MULTILIB_USEDEP}] |
62 |
- sys-libs/zlib[${MULTILIB_USEDEP}] |
63 |
- !app-admin/eselect-boost" |
64 |
-DEPEND="${RDEPEND} |
65 |
- =dev-util/boost-build-${MAJOR_V}*" |
66 |
-REQUIRED_USE=" |
67 |
- mpi? ( threads ) |
68 |
- python? ( ${PYTHON_REQUIRED_USE} )" |
69 |
- |
70 |
-S="${WORKDIR}/${MY_P}" |
71 |
- |
72 |
-# the tests will never fail because these are not intended as sanity |
73 |
-# tests at all. They are more a way for upstream to check their own code |
74 |
-# on new compilers. Since they would either be completely unreliable |
75 |
-# (failing for no good reason) or completely useless (never failing) |
76 |
-# there is no point in having them in the ebuild to begin with. |
77 |
-RESTRICT="test" |
78 |
- |
79 |
-PATCHES=( |
80 |
- "${FILESDIR}/${PN}-1.51.0-respect_python-buildid.patch" |
81 |
- "${FILESDIR}/${PN}-1.51.0-support_dots_in_python-buildid.patch" |
82 |
- "${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch" |
83 |
- "${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch" |
84 |
- "${FILESDIR}/${PN}-1.48.0-python_linking.patch" |
85 |
- "${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" |
86 |
- "${FILESDIR}/${PN}-1.55.0-context-x32.patch" |
87 |
- "${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch" |
88 |
-) |
89 |
- |
90 |
-python_bindings_needed() { |
91 |
- multilib_is_native_abi && use python |
92 |
-} |
93 |
- |
94 |
-tools_needed() { |
95 |
- multilib_is_native_abi && use tools |
96 |
-} |
97 |
- |
98 |
-create_user-config.jam() { |
99 |
- local compiler compiler_version compiler_executable |
100 |
- |
101 |
- if [[ ${CHOST} == *-darwin* ]]; then |
102 |
- compiler="darwin" |
103 |
- compiler_version="$(gcc-fullversion)" |
104 |
- compiler_executable="$(tc-getCXX)" |
105 |
- else |
106 |
- compiler="gcc" |
107 |
- compiler_version="$(gcc-version)" |
108 |
- compiler_executable="$(tc-getCXX)" |
109 |
- fi |
110 |
- local mpi_configuration python_configuration |
111 |
- |
112 |
- if use mpi; then |
113 |
- mpi_configuration="using mpi ;" |
114 |
- fi |
115 |
- |
116 |
- if python_bindings_needed; then |
117 |
- # boost expects libpython$(pyver) and doesn't allow overrides |
118 |
- # and the build system is so creepy that it's easier just to |
119 |
- # provide a symlink (linker's going to use SONAME anyway) |
120 |
- # TODO: replace it with proper override one day |
121 |
- ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die |
122 |
- |
123 |
- if tc-is-cross-compiler; then |
124 |
- python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;" |
125 |
- else |
126 |
- # note: we need to provide version explicitly because of |
127 |
- # a bug in the build system: |
128 |
- # https://github.com/boostorg/build/pull/104 |
129 |
- python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;" |
130 |
- fi |
131 |
- fi |
132 |
- |
133 |
- cat > "${BOOST_ROOT}/user-config.jam" << __EOF__ || die |
134 |
-using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ; |
135 |
-${mpi_configuration} |
136 |
-${python_configuration} |
137 |
-__EOF__ |
138 |
-} |
139 |
- |
140 |
-pkg_setup() { |
141 |
- # Bail out on unsupported build configuration, bug #456792 |
142 |
- if [[ -f "${EROOT%/}/etc/site-config.jam" ]]; then |
143 |
- grep -q gentoorelease "${EROOT%/}/etc/site-config.jam" && grep -q gentoodebug "${EROOT%/}/etc/site-config.jam" || |
144 |
- ( |
145 |
- eerror "You are using custom ${EROOT%/}/etc/site-config.jam without defined gentoorelease/gentoodebug targets." |
146 |
- eerror "Boost can not be built in such configuration." |
147 |
- eerror "Please, either remove this file or add targets from ${EROOT%/}/usr/share/boost-build/site-config.jam to it." |
148 |
- die |
149 |
- ) |
150 |
- fi |
151 |
-} |
152 |
- |
153 |
-src_prepare() { |
154 |
- default |
155 |
- |
156 |
- # Do not try to build missing 'wave' tool, bug #522682 |
157 |
- # Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507 |
158 |
- sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die |
159 |
- |
160 |
- multilib_copy_sources |
161 |
-} |
162 |
- |
163 |
-ejam() { |
164 |
- local b2_opts=( |
165 |
- "--user-config=${BOOST_ROOT}/user-config.jam" |
166 |
- "$@" |
167 |
- ) |
168 |
- echo b2 "${b2_opts[@]}" |
169 |
- b2 "${b2_opts[@]}" |
170 |
-} |
171 |
- |
172 |
-src_configure() { |
173 |
- # Workaround for too many parallel processes requested, bug #506064 |
174 |
- [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64" |
175 |
- |
176 |
- OPTIONS=( |
177 |
- $(usex debug gentoodebug gentoorelease) |
178 |
- "-j$(makeopts_jobs)" |
179 |
- -q |
180 |
- -d+2 |
181 |
- ) |
182 |
- |
183 |
- if [[ ${CHOST} == *-darwin* ]]; then |
184 |
- # We need to add the prefix, and in two cases this exceeds, so prepare |
185 |
- # for the largest possible space allocation. |
186 |
- append-ldflags -Wl,-headerpad_max_install_names |
187 |
- elif [[ ${CHOST} == *-winnt* ]]; then |
188 |
- compiler=parity |
189 |
- if [[ $($(tc-getCXX) -v) == *trunk* ]]; then |
190 |
- compilerVersion=trunk |
191 |
- else |
192 |
- compilerVersion=$($(tc-getCXX) -v | sed '1q' \ |
193 |
- | sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^ \t]*\) .*,\2,') |
194 |
- fi |
195 |
- compilerExecutable=$(tc-getCXX) |
196 |
- fi |
197 |
- |
198 |
- # bug 298489 |
199 |
- if use ppc || use ppc64; then |
200 |
- [[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec |
201 |
- fi |
202 |
- |
203 |
- # Use C++14 globally as of 1.62 |
204 |
- append-cxxflags -std=c++14 |
205 |
- |
206 |
- use icu && OPTIONS+=( |
207 |
- "-sICU_PATH=${EPREFIX}/usr" |
208 |
- ) |
209 |
- use icu || OPTIONS+=( |
210 |
- --disable-icu |
211 |
- boost.locale.icu=off |
212 |
- ) |
213 |
- use mpi || OPTIONS+=( |
214 |
- --without-mpi |
215 |
- ) |
216 |
- use nls || OPTIONS+=( |
217 |
- --without-locale |
218 |
- ) |
219 |
- use context || OPTIONS+=( |
220 |
- --without-context |
221 |
- --without-coroutine |
222 |
- --without-coroutine2 |
223 |
- --without-fiber |
224 |
- ) |
225 |
- use threads || OPTIONS+=( |
226 |
- --without-thread |
227 |
- ) |
228 |
- |
229 |
- OPTIONS+=( |
230 |
- pch=off |
231 |
- --boost-build="${EPREFIX}"/usr/share/boost-build |
232 |
- --prefix="${ED%/}/usr" |
233 |
- --layout=system |
234 |
- # building with threading=single is currently not possible |
235 |
- # https://svn.boost.org/trac/boost/ticket/7105 |
236 |
- threading=multi |
237 |
- link=$(usex static-libs shared,static shared) |
238 |
- ) |
239 |
- |
240 |
- [[ ${CHOST} == *-winnt* ]] && OPTIONS+=( |
241 |
- -sNO_BZIP2=1 |
242 |
- ) |
243 |
-} |
244 |
- |
245 |
-multilib_src_compile() { |
246 |
- local -x BOOST_ROOT="${BUILD_DIR}" |
247 |
- PYTHON_DIRS="" |
248 |
- MPI_PYTHON_MODULE="" |
249 |
- |
250 |
- building() { |
251 |
- create_user-config.jam |
252 |
- |
253 |
- local PYTHON_OPTIONS |
254 |
- if python_bindings_needed; then |
255 |
- PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}" |
256 |
- else |
257 |
- PYTHON_OPTIONS=" --without-python" |
258 |
- fi |
259 |
- |
260 |
- ejam \ |
261 |
- "${OPTIONS[@]}" \ |
262 |
- ${PYTHON_OPTIONS} \ |
263 |
- || die "Building of Boost libraries failed" |
264 |
- |
265 |
- if python_bindings_needed; then |
266 |
- if [[ -z "${PYTHON_DIRS}" ]]; then |
267 |
- PYTHON_DIRS="$(find bin.v2/libs -name python | sort)" |
268 |
- else |
269 |
- if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then |
270 |
- die "Inconsistent structure of build directories" |
271 |
- fi |
272 |
- fi |
273 |
- |
274 |
- local dir |
275 |
- for dir in ${PYTHON_DIRS}; do |
276 |
- mv ${dir} ${dir}-${EPYTHON} \ |
277 |
- || die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed" |
278 |
- done |
279 |
- |
280 |
- if use mpi; then |
281 |
- if [[ -z "${MPI_PYTHON_MODULE}" ]]; then |
282 |
- MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" |
283 |
- if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then |
284 |
- die "Multiple mpi.so files found" |
285 |
- fi |
286 |
- else |
287 |
- if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then |
288 |
- die "Inconsistent structure of build directories" |
289 |
- fi |
290 |
- fi |
291 |
- |
292 |
- mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON} \ |
293 |
- || die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${EPYTHON}' failed" |
294 |
- fi |
295 |
- fi |
296 |
- } |
297 |
- if python_bindings_needed; then |
298 |
- python_foreach_impl building |
299 |
- else |
300 |
- building |
301 |
- fi |
302 |
- |
303 |
- if tools_needed; then |
304 |
- pushd tools >/dev/null || die |
305 |
- |
306 |
- ejam \ |
307 |
- "${OPTIONS[@]}" \ |
308 |
- ${PYTHON_OPTIONS} \ |
309 |
- || die "Building of Boost tools failed" |
310 |
- popd >/dev/null || die |
311 |
- fi |
312 |
-} |
313 |
- |
314 |
-multilib_src_install_all() { |
315 |
- if ! use python; then |
316 |
- rm -r "${ED%/}"/usr/include/boost/python* || die |
317 |
- fi |
318 |
- |
319 |
- if ! use nls; then |
320 |
- rm -r "${ED%/}"/usr/include/boost/locale || die |
321 |
- fi |
322 |
- |
323 |
- if ! use context; then |
324 |
- rm -r "${ED%/}"/usr/include/boost/context || die |
325 |
- rm -r "${ED%/}"/usr/include/boost/coroutine{,2} || die |
326 |
- rm "${ED%/}"/usr/include/boost/asio/spawn.hpp || die |
327 |
- fi |
328 |
- |
329 |
- if use doc; then |
330 |
- # find extraneous files that shouldn't be installed |
331 |
- # as part of the documentation and remove them. |
332 |
- find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die |
333 |
- find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die |
334 |
- find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die |
335 |
- |
336 |
- docinto html |
337 |
- dodoc *.{htm,html,png,css} |
338 |
- dodoc -r doc libs more tools |
339 |
- |
340 |
- # To avoid broken links |
341 |
- dodoc LICENSE_1_0.txt |
342 |
- |
343 |
- dosym /usr/include/boost /usr/share/doc/${PF}/html/boost |
344 |
- fi |
345 |
-} |
346 |
- |
347 |
-multilib_src_install() { |
348 |
- local -x BOOST_ROOT="${BUILD_DIR}" |
349 |
- installation() { |
350 |
- create_user-config.jam |
351 |
- |
352 |
- local PYTHON_OPTIONS |
353 |
- if python_bindings_needed; then |
354 |
- local dir |
355 |
- for dir in ${PYTHON_DIRS}; do |
356 |
- cp -pr ${dir}-${EPYTHON} ${dir} \ |
357 |
- || die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed" |
358 |
- done |
359 |
- |
360 |
- if use mpi; then |
361 |
- cp -p stage/lib/mpi.so-${EPYTHON} "${MPI_PYTHON_MODULE}" \ |
362 |
- || die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed" |
363 |
- cp -p stage/lib/mpi.so-${EPYTHON} stage/lib/mpi.so \ |
364 |
- || die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed" |
365 |
- fi |
366 |
- PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}" |
367 |
- else |
368 |
- PYTHON_OPTIONS=" --without-python" |
369 |
- fi |
370 |
- |
371 |
- ejam \ |
372 |
- "${OPTIONS[@]}" \ |
373 |
- ${PYTHON_OPTIONS} \ |
374 |
- --includedir="${ED%/}/usr/include" \ |
375 |
- --libdir="${ED%/}/usr/$(get_libdir)" \ |
376 |
- install || die "Installation of Boost libraries failed" |
377 |
- |
378 |
- if python_bindings_needed; then |
379 |
- rm -r ${PYTHON_DIRS} || die |
380 |
- |
381 |
- # Move mpi.so Python module to Python site-packages directory. |
382 |
- # https://svn.boost.org/trac/boost/ticket/2838 |
383 |
- if use mpi; then |
384 |
- local moddir=$(python_get_sitedir)/boost |
385 |
- # moddir already includes eprefix |
386 |
- mkdir -p "${D}${moddir}" || die |
387 |
- mv "${ED%/}/usr/$(get_libdir)/mpi.so" "${D}${moddir}" || die |
388 |
- cat << EOF > "${D}${moddir}/__init__.py" || die |
389 |
-import sys |
390 |
-if sys.platform.startswith('linux'): |
391 |
- import DLFCN |
392 |
- flags = sys.getdlopenflags() |
393 |
- sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL) |
394 |
- from . import mpi |
395 |
- sys.setdlopenflags(flags) |
396 |
- del DLFCN, flags |
397 |
-else: |
398 |
- from . import mpi |
399 |
-del sys |
400 |
-EOF |
401 |
- fi |
402 |
- |
403 |
- python_optimize |
404 |
- fi |
405 |
- } |
406 |
- if python_bindings_needed; then |
407 |
- python_foreach_impl installation |
408 |
- else |
409 |
- installation |
410 |
- fi |
411 |
- |
412 |
- pushd "${ED%/}/usr/$(get_libdir)" >/dev/null || die |
413 |
- |
414 |
- local ext=$(get_libname) |
415 |
- if use threads; then |
416 |
- local f |
417 |
- for f in *${ext}; do |
418 |
- dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}} |
419 |
- done |
420 |
- fi |
421 |
- |
422 |
- popd >/dev/null || die |
423 |
- |
424 |
- if tools_needed; then |
425 |
- dobin dist/bin/* |
426 |
- |
427 |
- insinto /usr/share |
428 |
- doins -r dist/share/boostbook |
429 |
- fi |
430 |
- |
431 |
- # boost's build system truely sucks for not having a destdir. Because for |
432 |
- # this reason we are forced to build with a prefix that includes the |
433 |
- # DESTROOT, dynamic libraries on Darwin end messed up, referencing the |
434 |
- # DESTROOT instread of the actual EPREFIX. There is no way out of here |
435 |
- # but to do it the dirty way of manually setting the right install_names. |
436 |
- if [[ ${CHOST} == *-darwin* ]]; then |
437 |
- einfo "Working around completely broken build-system(tm)" |
438 |
- local d |
439 |
- for d in "${ED%/}"/usr/lib/*.dylib; do |
440 |
- if [[ -f ${d} ]]; then |
441 |
- # fix the "soname" |
442 |
- ebegin " correcting install_name of ${d#${ED}}" |
443 |
- install_name_tool -id "/${d#${D}}" "${d}" |
444 |
- eend $? |
445 |
- # fix references to other libs |
446 |
- refs=$(otool -XL "${d}" | \ |
447 |
- sed -e '1d' -e 's/^\t//' | \ |
448 |
- grep "^libboost_" | \ |
449 |
- cut -f1 -d' ') |
450 |
- local r |
451 |
- for r in ${refs}; do |
452 |
- ebegin " correcting reference to ${r}" |
453 |
- install_name_tool -change \ |
454 |
- "${r}" \ |
455 |
- "${EPREFIX}/usr/lib/${r}" \ |
456 |
- "${d}" |
457 |
- eend $? |
458 |
- done |
459 |
- fi |
460 |
- done |
461 |
- fi |
462 |
-} |
463 |
- |
464 |
-pkg_preinst() { |
465 |
- # Yai for having symlinks that are nigh-impossible to remove without |
466 |
- # resorting to dirty hacks like these. Removes lingering symlinks |
467 |
- # from the slotted versions. |
468 |
- local symlink |
469 |
- for symlink in "${EROOT%/}/usr/include/boost" "${EROOT%/}/usr/share/boostbook"; do |
470 |
- if [[ -L ${symlink} ]]; then |
471 |
- rm -f "${symlink}" || die |
472 |
- fi |
473 |
- done |
474 |
- |
475 |
- # some ancient installs still have boost cruft lying around |
476 |
- # for unknown reasons, causing havoc for reverse dependencies |
477 |
- # Bug: 607734 |
478 |
- rm -rf "${EROOT%/}"/usr/include/boost-1_[3-5]? || die |
479 |
-} |
480 |
|
481 |
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 |
482 |
deleted file mode 100644 |
483 |
index d4560400d7d..00000000000 |
484 |
--- a/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch |
485 |
+++ /dev/null |
486 |
@@ -1,62 +0,0 @@ |
487 |
---- a/libs/python/build/Jamfile.v2 |
488 |
-+++ b/libs/python/build/Jamfile.v2 |
489 |
-@@ -39,23 +39,6 @@ |
490 |
- PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" "_" ] ; |
491 |
- } |
492 |
- |
493 |
-- |
494 |
--rule find-py3-version |
495 |
--{ |
496 |
-- local versions = [ feature.values python ] ; |
497 |
-- local py3ver ; |
498 |
-- for local v in $(versions) |
499 |
-- { |
500 |
-- if $(v) >= 3.0 |
501 |
-- { |
502 |
-- py3ver = $(v) ; |
503 |
-- } |
504 |
-- } |
505 |
-- return $(py3ver) ; |
506 |
--} |
507 |
-- |
508 |
--py3-version = [ find-py3-version ] ; |
509 |
-- |
510 |
- project boost/python |
511 |
- : source-location ../src |
512 |
- : requirements |
513 |
-@@ -82,7 +65,7 @@ |
514 |
- rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } } |
515 |
- rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } } |
516 |
- |
517 |
--rule lib_boost_python ( is-py3 ? ) |
518 |
-+rule lib_boost_python |
519 |
- { |
520 |
- |
521 |
- local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ; |
522 |
-@@ -91,7 +74,7 @@ |
523 |
- { |
524 |
- python2 = true ; |
525 |
- } |
526 |
-- lib [ cond $(is-py3) : boost_python3 : boost_python ] |
527 |
-+ lib boost_python |
528 |
- : # sources |
529 |
- numeric.cpp |
530 |
- list.cpp |
531 |
-@@ -148,7 +131,6 @@ |
532 |
- <dependency>config-warning |
533 |
- |
534 |
- <python-debugging>on:<define>BOOST_DEBUG_PYTHON |
535 |
-- [ cond $(is-py3) : <python>$(py3-version) ] |
536 |
- : # default build |
537 |
- <link>shared |
538 |
- : # usage requirements |
539 |
-@@ -160,9 +142,3 @@ |
540 |
- |
541 |
- lib_boost_python ; |
542 |
- boost-install boost_python ; |
543 |
-- |
544 |
--if $(py3-version) |
545 |
--{ |
546 |
-- lib_boost_python yes ; |
547 |
-- boost-install boost_python3 ; |
548 |
--} |
549 |
|
550 |
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 |
551 |
deleted file mode 100644 |
552 |
index cb26792f99c..00000000000 |
553 |
--- a/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch |
554 |
+++ /dev/null |
555 |
@@ -1,23 +0,0 @@ |
556 |
---- a/libs/python/build/Jamfile.v2 |
557 |
-+++ b/libs/python/build/Jamfile.v2 |
558 |
-@@ -85,6 +85,12 @@ |
559 |
- rule lib_boost_python ( is-py3 ? ) |
560 |
- { |
561 |
- |
562 |
-+ local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ; |
563 |
-+ local python2 ; |
564 |
-+ if $(python_major_version) = 2 |
565 |
-+ { |
566 |
-+ python2 = true ; |
567 |
-+ } |
568 |
- lib [ cond $(is-py3) : boost_python3 : boost_python ] |
569 |
- : # sources |
570 |
- numeric.cpp |
571 |
-@@ -119,6 +125,7 @@ |
572 |
- : # requirements |
573 |
- <link>static:<define>BOOST_PYTHON_STATIC_LIB |
574 |
- <define>BOOST_PYTHON_SOURCE |
575 |
-+ [ cond $(python2) : <cxxflags>-fno-strict-aliasing ] |
576 |
- |
577 |
- # On Windows, all code using Python has to link to the Python |
578 |
- # import library. |
579 |
|
580 |
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 |
581 |
deleted file mode 100644 |
582 |
index 330cbb11e88..00000000000 |
583 |
--- a/dev-libs/boost/files/boost-1.48.0-python_linking.patch |
584 |
+++ /dev/null |
585 |
@@ -1,24 +0,0 @@ |
586 |
---- a/libs/python/build/Jamfile.v2 |
587 |
-+++ b/libs/python/build/Jamfile.v2 |
588 |
-@@ -109,20 +109,7 @@ |
589 |
- <link>static:<define>BOOST_PYTHON_STATIC_LIB |
590 |
- <define>BOOST_PYTHON_SOURCE |
591 |
- [ cond $(python2) : <cxxflags>-fno-strict-aliasing ] |
592 |
-- |
593 |
-- # On Windows, all code using Python has to link to the Python |
594 |
-- # import library. |
595 |
-- # |
596 |
-- # On *nix we never link libboost_python to libpython. When |
597 |
-- # extending Python, all Python symbols are provided by the |
598 |
-- # Python interpreter executable. When embedding Python, the |
599 |
-- # client executable is expected to explicitly link to |
600 |
-- # /python//python (the target representing libpython) itself. |
601 |
-- # |
602 |
-- # python_for_extensions is a target defined by Boost.Build to |
603 |
-- # provide the Python include paths, and on Windows, the Python |
604 |
-- # import library, as usage requirements. |
605 |
-- [ cond [ python.configured ] : <library>/python//python_for_extensions ] |
606 |
-+ [ cond [ python.configured ] : <library>/python//python ] |
607 |
- |
608 |
- # we prevent building when there is no python available |
609 |
- # as it's not possible anyway, and to cause dependents to |
610 |
|
611 |
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 |
612 |
deleted file mode 100644 |
613 |
index 17a681611b6..00000000000 |
614 |
--- a/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch |
615 |
+++ /dev/null |
616 |
@@ -1,69 +0,0 @@ |
617 |
-https://svn.boost.org/trac/boost/ticket/6286 |
618 |
- |
619 |
---- a/boostcpp.jam |
620 |
-+++ b/boostcpp.jam |
621 |
-@@ -99,13 +99,6 @@ |
622 |
- BUILD_ID = [ regex.replace $(build-id) "[*\\/:.\"\' ]" _ ] ; |
623 |
- } |
624 |
- |
625 |
--# Python build id (for Python libraries only). |
626 |
--python-id = [ option.get "python-buildid" ] ; |
627 |
--if $(python-id) |
628 |
--{ |
629 |
-- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; |
630 |
--} |
631 |
-- |
632 |
- |
633 |
- ################################################################################ |
634 |
- # |
635 |
---- a/libs/mpi/build/Jamfile.v2 |
636 |
-+++ b/libs/mpi/build/Jamfile.v2 |
637 |
-@@ -8,6 +8,8 @@ |
638 |
- # Authors: Douglas Gregor |
639 |
- # Andrew Lumsdaine |
640 |
- |
641 |
-+import option ; |
642 |
-+import regex ; |
643 |
- import mpi ; |
644 |
- import indirect ; |
645 |
- import python ; |
646 |
-@@ -24,6 +26,13 @@ |
647 |
- <tag>@$(__name__).tag |
648 |
- ; |
649 |
- |
650 |
-+# Python build id (for Python libraries only). |
651 |
-+python-id = [ option.get "python-buildid" ] ; |
652 |
-+if $(python-id) |
653 |
-+{ |
654 |
-+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; |
655 |
-+} |
656 |
-+ |
657 |
- rule tag ( name : type ? : property-set ) |
658 |
- { |
659 |
- local result = $(name) ; |
660 |
---- a/libs/python/build/Jamfile.v2 |
661 |
-+++ b/libs/python/build/Jamfile.v2 |
662 |
-@@ -2,6 +2,8 @@ |
663 |
- # Software License, Version 1.0. (See accompanying |
664 |
- # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
665 |
- |
666 |
-+import option ; |
667 |
-+import regex ; |
668 |
- import os ; |
669 |
- import indirect ; |
670 |
- import modules ; |
671 |
-@@ -30,6 +32,14 @@ |
672 |
- ; |
673 |
- } |
674 |
- |
675 |
-+# Python build id (for Python libraries only). |
676 |
-+python-id = [ option.get "python-buildid" ] ; |
677 |
-+if $(python-id) |
678 |
-+{ |
679 |
-+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; |
680 |
-+} |
681 |
-+ |
682 |
-+ |
683 |
- rule find-py3-version |
684 |
- { |
685 |
- local versions = [ feature.values python ] ; |
686 |
|
687 |
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 |
688 |
deleted file mode 100644 |
689 |
index a8912eb5e04..00000000000 |
690 |
--- a/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch |
691 |
+++ /dev/null |
692 |
@@ -1,22 +0,0 @@ |
693 |
---- a/libs/mpi/build/Jamfile.v2 |
694 |
-+++ b/libs/mpi/build/Jamfile.v2 |
695 |
-@@ -30,7 +30,7 @@ |
696 |
- python-id = [ option.get "python-buildid" ] ; |
697 |
- if $(python-id) |
698 |
- { |
699 |
-- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; |
700 |
-+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ; |
701 |
- } |
702 |
- |
703 |
- rule tag ( name : type ? : property-set ) |
704 |
---- a/libs/python/build/Jamfile.v2 |
705 |
-+++ b/libs/python/build/Jamfile.v2 |
706 |
-@@ -36,7 +36,7 @@ |
707 |
- python-id = [ option.get "python-buildid" ] ; |
708 |
- if $(python-id) |
709 |
- { |
710 |
-- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; |
711 |
-+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ; |
712 |
- } |
713 |
- |
714 |
- |