[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Lars Wendler]

commit:     dd68af9139cfb2a6c0a5a1df730c480b6f8197f8
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 00:18:51 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 00:21:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd68af91

sci-libs/fftw: Don't check for openmp toolchain when installing a binpkg.

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.4.ebuild | 5 ++---
 sci-libs/fftw/fftw-9999.ebuild  | 4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/sci-libs/fftw/fftw-3.3.4.ebuild b/sci-libs/fftw/fftw-3.3.4.ebuild
index c0e4b6f..a1e5ebf 100644
--- a/sci-libs/fftw/fftw-3.3.4.ebuild
+++ b/sci-libs/fftw/fftw-3.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -33,8 +33,7 @@ DEPEND="${RDEPEND}
        test? ( dev-lang/perl )"
 
 pkg_setup() {
-       # XXX: this looks like it should be used with BUILD_TYPE!=binary
-       if use openmp; then
+       if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
                if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
                        ewarn "OpenMP is not available in your current selected 
gcc"
                        die "need openmp capable gcc"

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index 1b2fc02..ec07ce4 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -38,9 +38,7 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 pkg_setup() {
-       # XXX: this looks like it should be used with BUILD_TYPE!=binary
-
-       if use openmp; then
+       if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
                if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
                        ewarn "OpenMP is not available in your current selected 
gcc"
                        die "need openmp capable gcc"