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 415CE158090 for ; Sat, 14 May 2022 21:30:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE92AE096D; Sat, 14 May 2022 21:30:43 +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 9C661E096D for ; Sat, 14 May 2022 21:30:43 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7FD17341BAA for ; Sat, 14 May 2022 21:30:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 040504D7 for ; Sat, 14 May 2022 21:30:38 +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: <1652563827.18aa29a9cc9ee5434c0d9664ba526c74444912d5.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/sundials/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/sundials/sundials-5.2.0.ebuild sci-libs/sundials/sundials-5.8.0.ebuild X-VCS-Directories: sci-libs/sundials/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 18aa29a9cc9ee5434c0d9664ba526c74444912d5 X-VCS-Branch: master Date: Sat, 14 May 2022 21:30:38 +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: 23ba4c0c-deed-44e7-b34f-ecb37443bb0c X-Archives-Hash: d26a809c32462e9927a6547f7e655b8b commit: 18aa29a9cc9ee5434c0d9664ba526c74444912d5 Author: David Seifert gentoo org> AuthorDate: Sat May 14 21:30:27 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Sat May 14 21:30:27 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18aa29a9 sci-libs/sundials: [QA] tc-has-openmp → tc-check-openmp Signed-off-by: David Seifert gentoo.org> sci-libs/sundials/sundials-5.2.0.ebuild | 12 +++++++----- sci-libs/sundials/sundials-5.8.0.ebuild | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/sci-libs/sundials/sundials-5.2.0.ebuild b/sci-libs/sundials/sundials-5.2.0.ebuild index c99c2b643966..5af24cd4ed75 100644 --- a/sci-libs/sundials/sundials-5.2.0.ebuild +++ b/sci-libs/sundials/sundials-5.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -31,11 +31,13 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch ) +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + use fortran && fortran-2_pkg_setup } src_prepare() { diff --git a/sci-libs/sundials/sundials-5.8.0.ebuild b/sci-libs/sundials/sundials-5.8.0.ebuild index 623a8cee16ed..517e32342ded 100644 --- a/sci-libs/sundials/sundials-5.8.0.ebuild +++ b/sci-libs/sundials/sundials-5.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -39,11 +39,13 @@ PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch ) +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + use fortran && fortran-2_pkg_setup } src_prepare() {