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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D0356138334 for ; Mon, 15 Apr 2019 00:22:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7989E08B1; Mon, 15 Apr 2019 00:22:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A9D94E08B1 for ; Mon, 15 Apr 2019 00:22:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 47A6F341189 for ; Mon, 15 Apr 2019 00:22:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B1A2E567 for ; Mon, 15 Apr 2019 00:22:25 +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: <1555287728.b5bfb994f73ecef8282a8b34a08857538ca33970.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/boost/, dev-libs/boost/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/boost/boost-1.70.0.ebuild dev-libs/boost/files/boost-1.70.0-fix-python-cmake-duplicate-target.patch X-VCS-Directories: dev-libs/boost/files/ dev-libs/boost/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: b5bfb994f73ecef8282a8b34a08857538ca33970 X-VCS-Branch: master Date: Mon, 15 Apr 2019 00:22:25 +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: 1cfce91d-15a9-4ee1-a433-846e569a8317 X-Archives-Hash: b76cdf917fb0c62a5cef026e4ecdb87c commit: b5bfb994f73ecef8282a8b34a08857538ca33970 Author: David Seifert gentoo org> AuthorDate: Mon Apr 15 00:21:20 2019 +0000 Commit: David Seifert gentoo org> CommitDate: Mon Apr 15 00:22:08 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5bfb994 dev-libs/boost: Use `--no-cmake-config` instead of patch * Credits go to @pdimov for the suggestion in boostorg/python/issues/262 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: David Seifert gentoo.org> dev-libs/boost/boost-1.70.0.ebuild | 5 +++- ...-1.70.0-fix-python-cmake-duplicate-target.patch | 33 ---------------------- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/dev-libs/boost/boost-1.70.0.ebuild b/dev-libs/boost/boost-1.70.0.ebuild index 6d40a9f7054..68a0140f778 100644 --- a/dev-libs/boost/boost-1.70.0.ebuild +++ b/dev-libs/boost/boost-1.70.0.ebuild @@ -51,7 +51,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.48.0-disable_icu_rpath.patch "${FILESDIR}"/${PN}-1.69.0-context-x32.patch "${FILESDIR}"/${PN}-1.56.0-build-auto_index-tool.patch - "${FILESDIR}"/${PN}-1.70.0-fix-python-cmake-duplicate-target.patch ) python_bindings_needed() { @@ -174,6 +173,10 @@ src_configure() { --boost-build="${EPREFIX}"/usr/share/boost-build --prefix="${ED}/usr" --layout=system + # CMake has issues working with multiple python impls, + # disable cmake config generation for the time being + # https://github.com/boostorg/python/issues/262#issuecomment-483069294 + --no-cmake-config # building with threading=single is currently not possible # https://svn.boost.org/trac/boost/ticket/7105 threading=multi diff --git a/dev-libs/boost/files/boost-1.70.0-fix-python-cmake-duplicate-target.patch b/dev-libs/boost/files/boost-1.70.0-fix-python-cmake-duplicate-target.patch deleted file mode 100644 index c0097a8581b..00000000000 --- a/dev-libs/boost/files/boost-1.70.0-fix-python-cmake-duplicate-target.patch +++ /dev/null @@ -1,33 +0,0 @@ -Boost.Build errors out when passing multiple python impls to b2: - - error: Name clash for '

libboost_python-variant-shared.cmake' - error: - error: Tried to build the target twice, with property sets having - error: these incompatible properties: - error: - error: - 2.7 - error: - 3.6 - error: - error: Please make sure to have consistent requirements for these - error: properties everywhere in your project, especially for install - error: targets. - -https://github.com/boostorg/python/issues/262 - ---- a/tools/boost_install/boost-install.jam -+++ b/tools/boost_install/boost-install.jam -@@ -870,12 +870,12 @@ - - $(p).mark-target-as-explicit install-libraries ; - -- install-cmake-config $(libraries) ; -+ # install-cmake-config $(libraries) ; - - generate install-dependencies : $(libraries) : @boost-install%generate-dependencies install ; - $(p).mark-target-as-explicit install-dependencies ; - -- alias install : install-libraries install-cmake-config install-dependencies ; -+ alias install : install-libraries install-dependencies ; - $(p).mark-target-as-explicit install ; - - # Target stage