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 55568138335 for ; Wed, 15 May 2019 14:53:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 318E4E0959; Wed, 15 May 2019 14:53:58 +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 057F6E0959 for ; Wed, 15 May 2019 14:53:57 +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 82D6A34456C for ; Wed, 15 May 2019 14:53:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C0DD5EA for ; Wed, 15 May 2019 14:53:55 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1557932005.2f08f26395d90650537e55432a57ce66b6a65abb.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/hpx/hpx-9999.ebuild X-VCS-Directories: sys-cluster/hpx/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2f08f26395d90650537e55432a57ce66b6a65abb X-VCS-Branch: master Date: Wed, 15 May 2019 14:53:55 +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: 242a756b-0bf8-4393-9ed9-6ff90d2817fd X-Archives-Hash: edca9c2479fa26469d15197b8aff7188 commit: 2f08f26395d90650537e55432a57ce66b6a65abb Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed May 15 14:32:12 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed May 15 14:53:25 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f08f263 sys-cluster/hpx: Sync live with 1.2.1 changes Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-cluster/hpx/hpx-9999.ebuild | 63 ++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild index 9f8589d7968..a57d12d298d 100644 --- a/sys-cluster/hpx/hpx-9999.ebuild +++ b/sys-cluster/hpx/hpx-9999.ebuild @@ -1,70 +1,67 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -CMAKE_MAKEFILE_GENERATOR="ninja" PYTHON_COMPAT=( python{2_7,3_5,3_6} ) -if [ ${PV} == 9999 ] ; then +if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git" else - SRC_URI="http://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz" + SRC_URI="https://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${PN}_${PV}" fi - -inherit cmake-utils fortran-2 multilib python-any-r1 +inherit cmake-utils fortran-2 python-any-r1 DESCRIPTION="C++ runtime system for parallel and distributed applications" -HOMEPAGE="http://stellar.cct.lsu.edu/tag/hpx/" +HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/" SLOT="0" LICENSE="Boost-1.0" IUSE="doc examples jemalloc papi +perftools tbb test" +REQUIRED_USE="?? ( jemalloc perftools tbb )" + +BDEPEND=" + virtual/pkgconfig + doc? ( >=dev-libs/boost-1.56.0-r1[tools] ) +" RDEPEND=" - tbb? ( dev-cpp/tbb ) - >=dev-libs/boost-1.49 - papi? ( dev-libs/papi ) - perftools? ( >=dev-util/google-perftools-1.7.1 ) + >=dev-libs/boost-1.49:= >=sys-apps/hwloc-1.8 >=sys-libs/libunwind-1 sys-libs/zlib + papi? ( dev-libs/papi ) + perftools? ( >=dev-util/google-perftools-1.7.1 ) + tbb? ( dev-cpp/tbb ) " DEPEND="${RDEPEND} - virtual/pkgconfig test? ( ${PYTHON_DEPS} ) - doc? ( >=dev-libs/boost-1.56.0-r1:=[tools] ) " -REQUIRED_USE=" - jemalloc? ( !perftools !tbb ) - perftools? ( !jemalloc !tbb ) - tbb? ( !jemalloc !perftools ) - " pkg_setup() { use test && python-any-r1_pkg_setup } src_configure() { - CMAKE_BUILD_TYPE=Release local mycmakeargs=( - -DHPX_BUILD_EXAMPLES=OFF - -DHPX_MALLOC=system - -DLIB=$(get_libdir) - -Dcmake_dir=cmake - -DHPX_BUILD_DOCUMENTATION=$(usex doc) - -DHPX_JEMALLOC=$(usex jemalloc) + -DHPX_WITH_EXAMPLES=OFF + -DHPX_WITH_DOCUMENTATION=$(usex doc) + -DHPX_WITH_PAPI=$(usex papi) + -DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools) -DBUILD_TESTING=$(usex test) - -DHPX_GOOGLE_PERFTOOLS=$(usex perftools) - -DHPX_PAPI=$(usex papi) ) - - use perftools && mycmakeargs+=( -DHPX_MALLOC=tcmalloc ) - use jemalloc && mycmakeargs+=( -DHPX_MALLOC=jemalloc ) - use tbb && mycmakeargs+=( -DHPX_MALLOC=tbbmalloc ) + if use jemalloc; then + mycmakeargs+=( -DHPX_WITH_MALLOC=jemalloc ) + elif use perftools; then + mycmakeargs+=( -DHPX_WITH_MALLOC=tcmalloc ) + elif use tbb; then + mycmakeargs+=( -DHPX_WITH_MALLOC=tbbmalloc ) + else + mycmakeargs+=( -DHPX_WITH_MALLOC=system ) + fi cmake-utils_src_configure } @@ -76,8 +73,8 @@ src_test() { src_install() { cmake-utils_src_install - mv "${D}/usr/bin/spin" "${D}/usr/bin/hpx_spin" if use examples; then + mv "${D}/usr/bin/spin" "${D}/usr/bin/hpx_spin" || die insinto /usr/share/doc/${PF} doins -r examples fi