Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/boost/files/, dev-libs/boost/
Date: Wed, 06 Jul 2022 10:28:01
Message-Id: 1657103251.83fa068a17d25caf9270499dc08f4b3f0e081dcc.asturm@gentoo
1 commit: 83fa068a17d25caf9270499dc08f4b3f0e081dcc
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 6 09:34:10 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 6 10:27:31 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83fa068a
7
8 dev-libs/boost: Drop 1.78.0-r2
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 dev-libs/boost/Manifest | 1 -
14 dev-libs/boost/boost-1.78.0-r2.ebuild | 338 ---------------------
15 .../boost-1.78.0-interprocess-musl-include.patch | 25 --
16 3 files changed, 364 deletions(-)
17
18 diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
19 index dda317544a26..7e0c56594141 100644
20 --- a/dev-libs/boost/Manifest
21 +++ b/dev-libs/boost/Manifest
22 @@ -1,2 +1 @@
23 -DIST boost_1_78_0.tar.bz2 110675550 BLAKE2B ed7da98862ec1e0a28472544400e6f44ffadbc967eed969ce6cb62b1c4f0b7a4b98a395269eb374b57326eff9cdb1dd6e47df9d1a9730aff7c926cc44388fb2d SHA512 9c34a387a203b99aa773eb0c59f5abac7a99ba10e4623653e793c1d5b29b99b88e0e4e0d4e2e4ca5d497c42f2e46e23bab66417722433a457dc818d7670bcbbf
24 DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312
25
26 diff --git a/dev-libs/boost/boost-1.78.0-r2.ebuild b/dev-libs/boost/boost-1.78.0-r2.ebuild
27 deleted file mode 100644
28 index 5d72852573ab..000000000000
29 --- a/dev-libs/boost/boost-1.78.0-r2.ebuild
30 +++ /dev/null
31 @@ -1,338 +0,0 @@
32 -# Copyright 1999-2022 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=8
36 -
37 -PYTHON_COMPAT=( python3_{8..10} )
38 -
39 -inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
40 -
41 -MY_PV="$(ver_rs 1- _)"
42 -MAJOR_V="$(ver_cut 1-2)"
43 -
44 -DESCRIPTION="Boost Libraries for C++"
45 -HOMEPAGE="https://www.boost.org/"
46 -SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
47 -S="${WORKDIR}/${PN}_${MY_PV}"
48 -
49 -LICENSE="Boost-1.0"
50 -SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
51 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
52 -IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd"
53 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
54 -# the tests will never fail because these are not intended as sanity
55 -# tests at all. They are more a way for upstream to check their own code
56 -# on new compilers. Since they would either be completely unreliable
57 -# (failing for no good reason) or completely useless (never failing)
58 -# there is no point in having them in the ebuild to begin with.
59 -RESTRICT="test"
60 -
61 -RDEPEND="
62 - !app-admin/eselect-boost
63 - !dev-libs/boost-numpy
64 - !<dev-libs/leatherman-1.12.0-r1
65 - bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
66 - icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
67 - !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
68 - lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
69 - mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
70 - python? (
71 - ${PYTHON_DEPS}
72 - numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
73 - )
74 - zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
75 - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
76 -DEPEND="${RDEPEND}"
77 -#BDEPEND=">=dev-util/boost-build-${MAJOR_V}"
78 -BDEPEND=">=dev-util/boost-build-1.78.0-r1"
79 -
80 -PATCHES=(
81 - "${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
82 - "${FILESDIR}"/${PN}-1.71.0-context-x32.patch
83 - "${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
84 - # Boost.MPI's __init__.py doesn't work on Py3
85 - "${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
86 - "${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch
87 -
88 - "${FILESDIR}"/${P}-interprocess-musl-include.patch
89 -)
90 -
91 -python_bindings_needed() {
92 - multilib_is_native_abi && use python
93 -}
94 -
95 -tools_needed() {
96 - multilib_is_native_abi && use tools
97 -}
98 -
99 -create_user-config.jam() {
100 - local user_config_jam="${BUILD_DIR}"/user-config.jam
101 - if [[ -s ${user_config_jam} ]]; then
102 - einfo "${user_config_jam} already exists, skipping configuration"
103 - return
104 - else
105 - einfo "Creating configuration in ${user_config_jam}"
106 - fi
107 -
108 - local compiler compiler_version compiler_executable="$(tc-getCXX)"
109 - if [[ ${CHOST} == *-darwin* ]]; then
110 - compiler="darwin"
111 - compiler_version="$(gcc-fullversion)"
112 - else
113 - compiler="gcc"
114 - compiler_version="$(gcc-version)"
115 - fi
116 -
117 - if use mpi; then
118 - local mpi_configuration="using mpi ;"
119 - fi
120 -
121 - cat > "${user_config_jam}" <<- __EOF__ || die
122 - using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" <archiver>"$(tc-getAR)" <ranlib>"$(tc-getRANLIB)" ;
123 - ${mpi_configuration}
124 - __EOF__
125 -
126 - if python_bindings_needed; then
127 - append_to_user_config() {
128 - local py_config
129 - if tc-is-cross-compiler; then
130 - py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
131 - else
132 - py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
133 - fi
134 - echo "${py_config}" >> "${user_config_jam}" || die
135 - }
136 - python_foreach_impl append_to_user_config
137 - fi
138 -
139 - if python_bindings_needed && use numpy; then
140 - einfo "Enabling support for NumPy extensions in Boost.Python"
141 - else
142 - einfo "Disabling support for NumPy extensions in Boost.Python"
143 -
144 - # Boost.Build does not allow for disabling of numpy
145 - # extensions, thereby leading to automagic numpy
146 - # https://github.com/boostorg/python/issues/111#issuecomment-280447482
147 - sed \
148 - -e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
149 - -i "${BUILD_DIR}"/libs/python/build/Jamfile || die
150 - fi
151 -}
152 -
153 -pkg_setup() {
154 - # Bail out on unsupported build configuration, bug #456792
155 - if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
156 - if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
157 - eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
158 - eerror "Boost can not be built in such configuration."
159 - eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
160 - die "Unsupported target in ${EROOT}/etc/site-config.jam"
161 - fi
162 - fi
163 -}
164 -
165 -src_prepare() {
166 - default
167 - multilib_copy_sources
168 -}
169 -
170 -ejam() {
171 - create_user-config.jam
172 -
173 - local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
174 - if python_bindings_needed; then
175 - append_to_b2_opts() {
176 - b2_opts+=( python="${EPYTHON#python}" )
177 - }
178 - python_foreach_impl append_to_b2_opts
179 - else
180 - b2_opts+=( --without-python )
181 - fi
182 - b2_opts+=( "$@" )
183 -
184 - echo b2 "${b2_opts[@]}" >&2
185 - b2 "${b2_opts[@]}"
186 -}
187 -
188 -src_configure() {
189 - # Workaround for too many parallel processes requested, bug #506064
190 - [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
191 -
192 - OPTIONS=(
193 - $(usex debug gentoodebug gentoorelease)
194 - "-j$(makeopts_jobs)"
195 - -q
196 - -d+2
197 - pch=off
198 - $(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
199 - $(usev !mpi --without-mpi)
200 - $(usev !nls --without-locale)
201 - $(usev !context '--without-context --without-coroutine --without-fiber')
202 - --without-stacktrace
203 - --boost-build="${BROOT}"/usr/share/boost-build/src
204 - --layout=system
205 - # building with threading=single is currently not possible
206 - # https://svn.boost.org/trac/boost/ticket/7105
207 - threading=multi
208 - link=shared
209 - # this seems to be the only way to disable compression algorithms
210 - # https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
211 - -sNO_BZIP2=$(usex bzip2 0 1)
212 - -sNO_LZMA=$(usex lzma 0 1)
213 - -sNO_ZLIB=$(usex zlib 0 1)
214 - -sNO_ZSTD=$(usex zstd 0 1)
215 - )
216 -
217 - if [[ ${CHOST} == *-darwin* ]]; then
218 - # We need to add the prefix, and in two cases this exceeds, so prepare
219 - # for the largest possible space allocation.
220 - append-ldflags -Wl,-headerpad_max_install_names
221 - fi
222 -
223 - # Use C++14 globally as of 1.62
224 - append-cxxflags -std=c++14
225 -}
226 -
227 -multilib_src_compile() {
228 - ejam \
229 - --prefix="${EPREFIX}"/usr \
230 - "${OPTIONS[@]}" || die
231 -
232 - if tools_needed; then
233 - pushd tools >/dev/null || die
234 - ejam \
235 - --prefix="${EPREFIX}"/usr \
236 - "${OPTIONS[@]}" \
237 - || die "Building of Boost tools failed"
238 - popd >/dev/null || die
239 - fi
240 -}
241 -
242 -multilib_src_install() {
243 - ejam \
244 - --prefix="${ED}"/usr \
245 - --includedir="${ED}"/usr/include \
246 - --libdir="${ED}"/usr/$(get_libdir) \
247 - "${OPTIONS[@]}" install || die "Installation of Boost libraries failed"
248 -
249 - if tools_needed; then
250 - dobin dist/bin/*
251 -
252 - insinto /usr/share
253 - doins -r dist/share/boostbook
254 - fi
255 -
256 - # boost's build system truely sucks for not having a destdir. Because for
257 - # this reason we are forced to build with a prefix that includes the
258 - # DESTROOT, dynamic libraries on Darwin end messed up, referencing the
259 - # DESTROOT instread of the actual EPREFIX. There is no way out of here
260 - # but to do it the dirty way of manually setting the right install_names.
261 - if [[ ${CHOST} == *-darwin* ]]; then
262 - einfo "Working around completely broken build-system(tm)"
263 - local d
264 - for d in "${ED}"/usr/lib/*.dylib; do
265 - if [[ -f ${d} ]]; then
266 - # fix the "soname"
267 - ebegin " correcting install_name of ${d#${ED}}"
268 - install_name_tool -id "/${d#${D}}" "${d}"
269 - eend $?
270 - # fix references to other libs
271 - refs=$(otool -XL "${d}" | \
272 - sed -e '1d' -e 's/^\t//' | \
273 - grep "^libboost_" | \
274 - cut -f1 -d' ')
275 - local r
276 - for r in ${refs}; do
277 - ebegin " correcting reference to ${r}"
278 - install_name_tool -change \
279 - "${r}" \
280 - "${EPREFIX}/usr/lib/${r}" \
281 - "${d}"
282 - eend $?
283 - done
284 - fi
285 - done
286 - fi
287 -}
288 -
289 -multilib_src_install_all() {
290 - if ! use numpy; then
291 - rm -r "${ED}"/usr/include/boost/python/numpy* || die
292 - fi
293 -
294 - if use python; then
295 - if use mpi; then
296 - move_mpi_py_into_sitedir() {
297 - python_moduleinto boost
298 - python_domodule "${S}"/libs/mpi/build/__init__.py
299 -
300 - python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so
301 - rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die
302 -
303 - python_optimize
304 - }
305 - python_foreach_impl move_mpi_py_into_sitedir
306 - else
307 - rm -r "${ED}"/usr/include/boost/mpi/python* || die
308 - fi
309 - else
310 - rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
311 - fi
312 -
313 - if ! use nls; then
314 - rm -r "${ED}"/usr/include/boost/locale || die
315 - fi
316 -
317 - if ! use context; then
318 - rm -r "${ED}"/usr/include/boost/context || die
319 - rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
320 - rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
321 - fi
322 -
323 - if use doc; then
324 - # find extraneous files that shouldn't be installed
325 - # as part of the documentation and remove them.
326 - find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
327 - find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
328 - find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
329 -
330 - docinto html
331 - dodoc *.{htm,html,png,css}
332 - dodoc -r doc libs more tools
333 -
334 - # To avoid broken links
335 - dodoc LICENSE_1_0.txt
336 -
337 - dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
338 - fi
339 -}
340 -
341 -pkg_preinst() {
342 - # Yay for having symlinks that are nigh-impossible to remove without
343 - # resorting to dirty hacks like these. Removes lingering symlinks
344 - # from the slotted versions.
345 - local symlink
346 - for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
347 - if [[ -L ${symlink} ]]; then
348 - rm -f "${symlink}" || die
349 - fi
350 - done
351 -
352 - # some ancient installs still have boost cruft lying around
353 - # for unknown reasons, causing havoc for reverse dependencies
354 - # Bug: 607734
355 - rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
356 -}
357 -
358 -pkg_postinst() {
359 - elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
360 - elog
361 - elog " undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
362 - elog " <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
363 - elog
364 - elog "Then you need to recompile Boost and all its reverse dependencies"
365 - elog "using the same toolchain. In general, *every* change of the C++ toolchain"
366 - elog "requires a complete rebuild of the Boost-dependent ecosystem."
367 - elog
368 - elog "See for instance https://bugs.gentoo.org/638138"
369 -}
370
371 diff --git a/dev-libs/boost/files/boost-1.78.0-interprocess-musl-include.patch b/dev-libs/boost/files/boost-1.78.0-interprocess-musl-include.patch
372 deleted file mode 100644
373 index 85d25861f11b..000000000000
374 --- a/dev-libs/boost/files/boost-1.78.0-interprocess-musl-include.patch
375 +++ /dev/null
376 @@ -1,25 +0,0 @@
377 -https://github.com/boostorg/interprocess/commit/d002a0d929ecb031843d806c2bda69e013442e13
378 -https://bugs.gentoo.org/829147
379 -
380 -From: Leonardo Neumann <leonardo@×××××××××××.br>
381 -Date: Mon, 13 Dec 2021 01:07:20 -0300
382 -Subject: [PATCH] Fix missing sys/stat.h include on musl-based systems
383 -
384 -Boost 1.78.0 fails to build on musl-based systems because musl does
385 -not include sys/stat.h by default.
386 -
387 -Fixes #161 ("Boost compiler error")
388 ---- a/boost/interprocess/permissions.hpp
389 -+++ b/boost/interprocess/permissions.hpp
390 -@@ -29,6 +29,10 @@
391 -
392 - #include <boost/interprocess/detail/win32_api.hpp>
393 -
394 -+#else
395 -+
396 -+#include <sys/stat.h>
397 -+
398 - #endif
399 -
400 - #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
401 -