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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DBFD2139085 for ; Tue, 10 Jan 2017 01:05:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 359B1E0D32; Tue, 10 Jan 2017 01:05:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 16333E0D32 for ; Tue, 10 Jan 2017 01:05:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE5FC340C97 for ; Tue, 10 Jan 2017 01:05:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 84039261C for ; Tue, 10 Jan 2017 01:05:08 +0000 (UTC) From: "Martin Mokrejs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Martin Mokrejs" Message-ID: <1484010302.49c918e8544ecb0141046aef3b71795b46dd1fcd.mmokrejs@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/vcflib/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/vcflib/vcflib-9999.ebuild X-VCS-Directories: sci-biology/vcflib/ X-VCS-Committer: mmokrejs X-VCS-Committer-Name: Martin Mokrejs X-VCS-Revision: 49c918e8544ecb0141046aef3b71795b46dd1fcd X-VCS-Branch: master Date: Tue, 10 Jan 2017 01:05:08 +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-Archives-Salt: 5e3f21d2-039c-4baa-b798-097f92f79101 X-Archives-Hash: 82edaa6eee033b79de45e3c01df0330c commit: 49c918e8544ecb0141046aef3b71795b46dd1fcd Author: Martin Mokrejš fold natur cuni cz> AuthorDate: Tue Jan 10 01:05:02 2017 +0000 Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Tue Jan 10 01:05:02 2017 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=49c918e8 sci-biology/vcflib: disctinguish various openmp commandline switches Package-Manager: Portage-2.3.3, Repoman-2.3.1 sci-biology/vcflib/vcflib-9999.ebuild | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/sci-biology/vcflib/vcflib-9999.ebuild b/sci-biology/vcflib/vcflib-9999.ebuild index 5a03fe4..d66d935 100644 --- a/sci-biology/vcflib/vcflib-9999.ebuild +++ b/sci-biology/vcflib/vcflib-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,9 +15,9 @@ EGIT_REPO_URI="https://github.com/vcflib/vcflib.git" LICENSE="MIT-with-advertising" SLOT="0" KEYWORDS="" -IUSE="mpi" +IUSE="openmp" -DEPEND="mpi? ( sys-cluster/openmpi )" +DEPEND="" RDEPEND="${DEPEND}" # contains bundled sci-biology/htslib ? # see also ./include for possible traces of other bundled sw @@ -26,10 +26,21 @@ src_prepare(){ default sed -e "s/^CXX = g++/CXX = $(tc-getCXX)/" -i Makefile || die sed -e "s/^CXXFLAGS = -O3/CXXFLAGS = ${CXXFLAGS}/" -i Makefile || die + # openmp detection stolen from velvet-1.2.10.ebuild + if use openmp; then + if [[ $(tc-getCXX) =~ g++ ]]; then + local eopenmp=-fopenmp + elif [[ $(tc-getCXX) =~ cxx ]]; then + local eopenmp=-openmp + sed -e "s/-fopenmp/${eopenmp}/" -i Makefile || die + else + elog "Cannot detect compiler type so not setting openmp support" + fi + fi } src_compile(){ - if use mpi ; then + if use openmp ; then emake openmp else emake