public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Tiziano Müller" <dev-zero@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/dev-zero:master commit in: sci-chemistry/cp2k/
Date: Thu, 17 Mar 2016 14:45:39 +0000 (UTC)	[thread overview]
Message-ID: <1458225931.eb5d6d5e83c9ce811323f665d72f42c69cc36087.dev-zero@gentoo> (raw)

commit:     eb5d6d5e83c9ce811323f665d72f42c69cc36087
Author:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 14:45:31 2016 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 14:45:31 2016 +0000
URL:        https://gitweb.gentoo.org/dev/dev-zero.git/commit/?id=eb5d6d5e

sci-chemistry/cp2k: fix some issues with the openmp flag

 sci-chemistry/cp2k/cp2k-3.0.ebuild | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sci-chemistry/cp2k/cp2k-3.0.ebuild b/sci-chemistry/cp2k/cp2k-3.0.ebuild
index 1d2218c..c589efb 100644
--- a/sci-chemistry/cp2k/cp2k-3.0.ebuild
+++ b/sci-chemistry/cp2k/cp2k-3.0.ebuild
@@ -18,10 +18,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+fftw openmp"
+IUSE="+fftw +openmp"
 
 RDEPEND="virtual/blas
-	fftw? ( sci-libs/fftw:3.0=[fortran,openmp?,threads] )"
+	fftw? ( openmp? ( sci-libs/fftw:3.0=[fortran,openmp] )
+		!openmp? ( sci-libs/fftw:3.0=[fortran,threads] ) )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	${PYTHON_DEPS}"
@@ -41,9 +42,9 @@ src_configure() {
 
 	if use fftw ; then
 		if use openmp ; then
-			libs+=($(pkg-config --libs fftw3))
-		else
 			libs+=($(pkg-config --libs fftw3_omp))
+		else
+			libs+=($(pkg-config --libs fftw3_threads))
 		fi
 		defines+=(-D__FFTW3)
 		echo ${defines[*]}


             reply	other threads:[~2016-03-17 14:45 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-17 14:45 Tiziano Müller [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-04-22  8:40 [gentoo-commits] dev/dev-zero:master commit in: sci-chemistry/cp2k/ Tiziano Müller
2016-04-18 10:33 Tiziano Müller
2016-03-17 10:50 Tiziano Müller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1458225931.eb5d6d5e83c9ce811323f665d72f42c69cc36087.dev-zero@gentoo \
    --to=dev-zero@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox