From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1318937-garchives=archives.gentoo.org@lists.gentoo.org> 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 818B1158042 for <garchives@archives.gentoo.org>; Tue, 7 Sep 2021 10:47:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26DF7E0919; Tue, 7 Sep 2021 10:47:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 0DA65E0919 for <gentoo-commits@lists.gentoo.org>; Tue, 7 Sep 2021 10:47:54 +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 B067E342A79 for <gentoo-commits@lists.gentoo.org>; Tue, 7 Sep 2021 10:47:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DCF99A7 for <gentoo-commits@lists.gentoo.org>; Tue, 7 Sep 2021 10:47:51 +0000 (UTC) From: "Alessandro Barbieri" <lssndrbarbieri@gmail.com> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alessandro Barbieri" <lssndrbarbieri@gmail.com> Message-ID: <1631011669.be6ba927d05edc1494cc9afa23c4bbbda070ba0e.Alessandro-Barbieri@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/nanos6/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sys-cluster/nanos6/nanos6-2.6-r3.ebuild sys-cluster/nanos6/nanos6-2.6-r4.ebuild X-VCS-Directories: sys-cluster/nanos6/ X-VCS-Committer: Alessandro-Barbieri X-VCS-Committer-Name: Alessandro Barbieri X-VCS-Revision: be6ba927d05edc1494cc9afa23c4bbbda070ba0e X-VCS-Branch: dev Date: Tue, 7 Sep 2021 10:47:51 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 12514597-e069-4095-acb8-f7efd3b786cb X-Archives-Hash: 0f35ce98b6974412bb53475b1243e5ca commit: be6ba927d05edc1494cc9afa23c4bbbda070ba0e Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> AuthorDate: Tue Sep 7 07:26:01 2021 +0000 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> CommitDate: Tue Sep 7 10:47:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=be6ba927 sys-cluster/nanos6: babeltrace use, no test with mercurium Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> .../{nanos6-2.6-r3.ebuild => nanos6-2.6-r4.ebuild} | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sys-cluster/nanos6/nanos6-2.6-r3.ebuild b/sys-cluster/nanos6/nanos6-2.6-r4.ebuild similarity index 85% rename from sys-cluster/nanos6/nanos6-2.6-r3.ebuild rename to sys-cluster/nanos6/nanos6-2.6-r4.ebuild index 428c57be5..dca1a609a 100644 --- a/sys-cluster/nanos6/nanos6-2.6-r3.ebuild +++ b/sys-cluster/nanos6/nanos6-2.6-r4.ebuild @@ -13,9 +13,9 @@ S="${WORKDIR}/${PN}-version-${PV}" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="debug dlb execution-workflow extrae memkind mercurium papi pqos test unwind" -#jemalloc require custom stuff -#TODO: cuda babeltrace2 +IUSE="babeltrace debug dlb execution-workflow extrae memkind mercurium papi pqos test unwind" +#jemalloc require custom jemalloc +#TODO: cuda #TODO: llvm-libunwind RDEPEND=" @@ -24,6 +24,7 @@ RDEPEND=" sys-process/numactl virtual/libelf + babeltrace? ( dev-util/babeltrace2 ) dlb? ( sys-cluster/dlb ) extrae? ( sys-cluster/extrae[nanos] ) memkind? ( dev-libs/memkind ) @@ -32,13 +33,12 @@ RDEPEND=" pqos? ( sys-apps/intel-cmt-cat ) unwind? ( sys-libs/libunwind ) " -# jemalloc? ( dev-libs/jemalloc ) DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}/${P}-include-string.patch" ) -# https://github.com/bsc-pm/nanos6/issues/3 -RESTRICT="test" -#RESTRICT="!test? ( test )" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( !mercurium )" # https://github.com/bsc-pm/nanos6/issues/3 + src_prepare() { default @@ -55,7 +55,6 @@ src_configure() { --with-boost="${EPREFIX}/usr" --with-libnuma="${EPREFIX}/usr" - --with-pic --without-git --without-k1om @@ -64,15 +63,16 @@ src_configure() { $(use_enable debug extra-debug) ) + use dlb && myconf+=( "--with-dlb=${EPREFIX}/usr" ) use memkind && myconf+=( "--with-memkind=${EPREFIX}/usr" ) use pqos && myconf+=( "--with-pqos=${EPREFIX}/usr" ) -# if use babeltrace; then -# myconf+=( "--with-babeltrace2=${EPREFIX}/usr" ) -# else -# myconf+=( "--without-babeltrace2" ) -# fi + if use babeltrace; then + myconf+=( "--with-babeltrace2=${EPREFIX}/usr" ) + else + myconf+=( "--without-babeltrace2" ) + fi if use extrae; then myconf+=( "--with-extrae=${EPREFIX}/usr" ) else