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 07668158091 for ; Tue, 14 Jun 2022 18:35:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EAAD7E08FA; Tue, 14 Jun 2022 18:35:33 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CD3B5E08FB for ; Tue, 14 Jun 2022 18:35:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E429E3413DC for ; Tue, 14 Jun 2022 18:35:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FF5F521 for ; Tue, 14 Jun 2022 18:35:29 +0000 (UTC) From: "Haelwenn Monnier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Haelwenn Monnier" Message-ID: <1655215849.032e53b3053c5e6dcaac32928f7f900a33948fe2.lanodan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: sys-cluster/parsec/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sys-cluster/parsec/parsec-3.0.2012-r1.ebuild sys-cluster/parsec/parsec-3.0.2012-r2.ebuild X-VCS-Directories: sys-cluster/parsec/ X-VCS-Committer: lanodan X-VCS-Committer-Name: Haelwenn Monnier X-VCS-Revision: 032e53b3053c5e6dcaac32928f7f900a33948fe2 X-VCS-Branch: master Date: Tue, 14 Jun 2022 18:35:29 +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: cfa8c060-99a0-42f3-9bc1-5c16ae8fc26a X-Archives-Hash: 0d2c88e8c88d29c438c4b76aaf0da5af commit: 032e53b3053c5e6dcaac32928f7f900a33948fe2 Author: Viorel Munteanu gmail com> AuthorDate: Tue Jun 14 14:08:02 2022 +0000 Commit: Haelwenn Monnier hacktivis me> CommitDate: Tue Jun 14 14:10:49 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=032e53b3 sys-cluster/parsec: fix wrong LDFLAGS in .pc file Closes: https://bugs.gentoo.org/810970 Closes: https://bugs.gentoo.org/810961 Signed-off-by: Viorel Munteanu gmail.com> ...sec-3.0.2012-r1.ebuild => parsec-3.0.2012-r2.ebuild} | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sys-cluster/parsec/parsec-3.0.2012-r1.ebuild b/sys-cluster/parsec/parsec-3.0.2012-r2.ebuild similarity index 87% rename from sys-cluster/parsec/parsec-3.0.2012-r1.ebuild rename to sys-cluster/parsec/parsec-3.0.2012-r2.ebuild index 26286f3dc..c6cb03d99 100644 --- a/sys-cluster/parsec/parsec-3.0.2012-r1.ebuild +++ b/sys-cluster/parsec/parsec-3.0.2012-r2.ebuild @@ -7,7 +7,7 @@ DOCS_BUILDER="doxygen" DOCS_DIR="docs/doxygen" PYTHON_COMPAT=( python3_{8..11} pypy3 ) -inherit cmake edo fortran-2 docs python-single-r1 +inherit cmake fortran-2 docs python-single-r1 DESCRIPTION="Parallel Runtime Scheduler and Execution Controller" HOMEPAGE=" @@ -98,10 +98,17 @@ pkg_setup() { } src_prepare() { - edo sed \ - -e "s|\${CMAKE_INSTALL_PREFIX}/|${D}/\${CMAKE_INSTALL_PREFIX}/|g" \ - -e "s|--prefix|--root ${D} --prefix|g" \ - -i tools/profiling/python/CMakeLists.txt + # cannot use ${D} in src_prepare, just skip this directory, it doesn't get installed + sed '/profiling/d' tools/CMakeLists.txt || die + + # 810970 remove unwanted flags from parsec.pc + sed -i -e "s/ @EXTRA_CFLAGS@//" -e "s/ @EXTRA_LDFLAGS@//" parsec/include/parsec.pc.in || die + + # 810961: 2 tests fail, 2 time out + sed -i -e "/unit_dtd_war_shm/d" -e "/unit_dtd_war_mpi/d" tests/interfaces/superscalar/CMakeLists.txt || die + sed -i -e "/unit_haar_tree_mpi/d" tests/haar-tree-project/CMakeLists.txt || die + sed -i -e "/unit_merge_sort_mpi/d" tests/merge_sort/Testings.cmake || die + cmake_src_prepare }