From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 88A8115838C for ; Fri, 26 Jan 2024 12:20:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9107E2A0E; Fri, 26 Jan 2024 12:20:20 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 66A6AE2A0E for ; Fri, 26 Jan 2024 12:20:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 68BC6343320 for ; Fri, 26 Jan 2024 12:20:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A14BD1082 for ; Fri, 26 Jan 2024 12:20:17 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1706271597.c422e8f408e2091948d2d34080c6f7ac5d32e359.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/boost/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/boost/boost-1.84.0-r2.ebuild dev-libs/boost/boost-1.84.0-r3.ebuild X-VCS-Directories: dev-libs/boost/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: c422e8f408e2091948d2d34080c6f7ac5d32e359 X-VCS-Branch: master Date: Fri, 26 Jan 2024 12:20:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 85e4d87b-b2e8-4a00-a598-52d20b263162 X-Archives-Hash: 02468b83dda6e35700b036f55b6f3897 commit: c422e8f408e2091948d2d34080c6f7ac5d32e359 Author: David Seifert gentoo org> AuthorDate: Fri Jan 26 12:19:57 2024 +0000 Commit: David Seifert gentoo org> CommitDate: Fri Jan 26 12:19:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c422e8f4 dev-libs/boost: drop boost.mpi __init__.py * Upstream is unresponsive and the file still uses pre-PEP328 imports, instead let the python interpreter load `mpi.so` directly. Signed-off-by: David Seifert gentoo.org> ...ost-1.84.0-r2.ebuild => boost-1.84.0-r3.ebuild} | 27 +++++++--------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/dev-libs/boost/boost-1.84.0-r2.ebuild b/dev-libs/boost/boost-1.84.0-r3.ebuild similarity index 95% rename from dev-libs/boost/boost-1.84.0-r2.ebuild rename to dev-libs/boost/boost-1.84.0-r3.ebuild index 8240ff805fc4..a9b31a9a58c3 100644 --- a/dev-libs/boost/boost-1.84.0-r2.ebuild +++ b/dev-libs/boost/boost-1.84.0-r3.ebuild @@ -34,10 +34,10 @@ RESTRICT="test" RDEPEND=" bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] ) - icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] ) + icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] ) lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] ) - mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] ) + mpi? ( virtual/mpi[${MULTILIB_USEDEP},cxx,threads] ) python? ( ${PYTHON_DEPS} numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) @@ -50,24 +50,14 @@ BDEPEND=">=dev-build/b2-4.9.2" PATCHES=( "${FILESDIR}"/${PN}-1.81.0-disable_icu_rpath.patch "${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch - # Boost.MPI's __init__.py doesn't work on Py3 - "${FILESDIR}"/${PN}-1.79.0-boost-mpi-python-PEP-328.patch - "${FILESDIR}"/${PN}-1.83.0-math-gcc14.patch # upstreamed + "${FILESDIR}"/${PN}-1.83.0-math-gcc14.patch "${FILESDIR}"/${PN}-1.79.0-context-x32.patch "${FILESDIR}"/${PN}-1.84.0-signals2-patch1.patch "${FILESDIR}"/${PN}-1.84.0-signals2-patch2.patch ) -python_bindings_needed() { - multilib_is_native_abi && use python -} - -tools_needed() { - multilib_is_native_abi && use tools -} - create_user-config.jam() { local user_config_jam="${BUILD_DIR}"/user-config.jam if [[ -s ${user_config_jam} ]]; then @@ -90,7 +80,7 @@ create_user-config.jam() { ${mpi_configuration} __EOF__ - if python_bindings_needed; then + if multilib_native_use python; then append_to_user_config() { local py_config if tc-is-cross-compiler; then @@ -103,7 +93,7 @@ create_user-config.jam() { python_foreach_impl append_to_user_config fi - if python_bindings_needed && use numpy; then + if multilib_native_use python && use numpy; then einfo "Enabling support for NumPy extensions in Boost.Python" else einfo "Disabling support for NumPy extensions in Boost.Python" @@ -138,7 +128,7 @@ ejam() { create_user-config.jam local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" ) - if python_bindings_needed; then + if multilib_native_use python; then append_to_b2_opts() { b2_opts+=( python="${EPYTHON#python}" ) } @@ -212,7 +202,7 @@ multilib_src_compile() { --prefix="${EPREFIX}"/usr \ "${OPTIONS[@]}" || die - if tools_needed; then + if multilib_native_use tools; then pushd tools >/dev/null || die ejam \ --prefix="${EPREFIX}"/usr \ @@ -229,7 +219,7 @@ multilib_src_install() { --libdir="${ED}"/usr/$(get_libdir) \ "${OPTIONS[@]}" install || die "Installation of Boost libraries failed" - if tools_needed; then + if multilib_native_use tools; then dobin dist/bin/* insinto /usr/share @@ -286,7 +276,6 @@ multilib_src_install_all() { if use mpi; then move_mpi_py_into_sitedir() { python_moduleinto boost - python_domodule "${S}"/libs/mpi/build/__init__.py python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die