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 1D916158090 for ; Sat, 14 May 2022 21:30:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05D3DE095F; 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 D9D13E095D for ; Sat, 14 May 2022 21:30:42 +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 38C84341B94 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 ACB1C4C8 for ; Sat, 14 May 2022 21:30:37 +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: <1652563823.a8ff4bb9491b47186c73c7c20c4d5d7be761ee8a.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/hypre/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/hypre/hypre-2.20.0.ebuild sci-libs/hypre/hypre-2.21.0.ebuild X-VCS-Directories: sci-libs/hypre/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: a8ff4bb9491b47186c73c7c20c4d5d7be761ee8a X-VCS-Branch: master Date: Sat, 14 May 2022 21:30:37 +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: 8ab843a6-1f7f-412e-91c3-9aeea7bde5d7 X-Archives-Hash: 3fee261ac8e09825bf451f0cff436fb7 commit: a8ff4bb9491b47186c73c7c20c4d5d7be761ee8a Author: David Seifert gentoo org> AuthorDate: Sat May 14 21:30:23 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Sat May 14 21:30:23 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8ff4bb9 sci-libs/hypre: [QA] tc-has-openmp → tc-check-openmp Signed-off-by: David Seifert gentoo.org> sci-libs/hypre/hypre-2.20.0.ebuild | 17 +++++++---------- sci-libs/hypre/hypre-2.21.0.ebuild | 17 +++++++---------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/sci-libs/hypre/hypre-2.20.0.ebuild b/sci-libs/hypre/hypre-2.20.0.ebuild index c7a163995f57..f1b93093da7b 100644 --- a/sci-libs/hypre/hypre-2.20.0.ebuild +++ b/sci-libs/hypre/hypre-2.20.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 @@ -27,16 +27,12 @@ DEPEND="${RDEPEND}" DOCS=( CHANGELOG COPYRIGHT README ) pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] ; then - tc-check-openmp - fi + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp ; then - ewarn "You are using a non capable gcc compiler ( < 4.2 ? )" - die "Need an OpenMP capable compiler" - fi + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + use fortran && fortran-2_pkg_setup } src_prepare() { @@ -60,8 +56,9 @@ src_configure() { tc-export CC CXX append-flags -Dhypre_dgesvd=dgesvd_ - if use openmp && [[ $(tc-getCC) == *gcc* ]] ; then - append-flags -fopenmp && append-ldflags -fopenmp + if use openmp ; then + append-flags -fopenmp + append-ldflags -fopenmp fi if use mpi ; then diff --git a/sci-libs/hypre/hypre-2.21.0.ebuild b/sci-libs/hypre/hypre-2.21.0.ebuild index dea4da0e5cd7..8c9d5ab220f1 100644 --- a/sci-libs/hypre/hypre-2.21.0.ebuild +++ b/sci-libs/hypre/hypre-2.21.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 @@ -28,16 +28,12 @@ DEPEND="${RDEPEND}" DOCS=( CHANGELOG COPYRIGHT README ) pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] ; then - tc-check-openmp - fi + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp ; then - ewarn "You are using a non capable gcc compiler ( < 4.2 ? )" - die "Need an OpenMP capable compiler" - fi + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + use fortran && fortran-2_pkg_setup } src_prepare() { @@ -61,8 +57,9 @@ src_configure() { tc-export CC CXX append-flags -Dhypre_dgesvd=dgesvd_ - if use openmp && [[ $(tc-getCC) == *gcc* ]] ; then - append-flags -fopenmp && append-ldflags -fopenmp + if use openmp ; then + append-flags -fopenmp + append-ldflags -fopenmp fi if use mpi ; then