From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 999671381FA for ; Sat, 29 Dec 2012 23:00:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 847FB21C010; Sat, 29 Dec 2012 22:59:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 01FC921C010 for ; Sat, 29 Dec 2012 22:59:57 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1250933D806 for ; Sat, 29 Dec 2012 22:59:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9D085E544B for ; Sat, 29 Dec 2012 22:59:54 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1356821654.bccb1a9f8ddaa2dc32b48578280c0b10cc6a50ef.kleiner_otti@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/gromacs/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/gromacs/ChangeLog sci-chemistry/gromacs/gromacs-4.6.9999.ebuild X-VCS-Directories: sci-chemistry/gromacs/ X-VCS-Committer: kleiner_otti X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: bccb1a9f8ddaa2dc32b48578280c0b10cc6a50ef X-VCS-Branch: master Date: Sat, 29 Dec 2012 22:59:54 +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: 2179a322-59e6-46e6-b720-d0cbf88385ec X-Archives-Hash: 2f9250fb1d794d8393ed1ea63451d8f5 commit: bccb1a9f8ddaa2dc32b48578280c0b10cc6a50ef Author: Christoph Junghans gentoo org> AuthorDate: Sat Dec 29 22:54:14 2012 +0000 Commit: Christoph Junghans gmx de> CommitDate: Sat Dec 29 22:54:14 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bccb1a9f fixed build with newer mkl Package-Manager: portage-2.2.0_alpha149 --- sci-chemistry/gromacs/ChangeLog | 3 +++ sci-chemistry/gromacs/gromacs-4.6.9999.ebuild | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog index c2c3f21..2c7bfe2 100644 --- a/sci-chemistry/gromacs/ChangeLog +++ b/sci-chemistry/gromacs/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 29 Dec 2012; Christoph Junghans gromacs-4.6.9999.ebuild: + fixed build with newer mkl + 27 Dec 2012; Christoph Junghans gromacs-4.6.9999.ebuild: sci-chemistry/gromacs: clean up diff --git a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild index 8e13d99..94dbbdd 100644 --- a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild @@ -105,11 +105,17 @@ src_configure() { if use fftw; then fft_opts=( -DGMX_FFT_LIBRARY=fftw3 ) - elif use mkl; then + elif use mkl && has_version "=sci-libs/mkl-10*"; then fft_opts=( -DGMX_FFT_LIBRARY=mkl -DMKL_INCLUDE_DIR="${MKLROOT}/include" -DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)" ) + elif use mkl; then + local bits=$(get_libdir) + fft_opts=( -DGMX_FFT_LIBRARY=mkl + -DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)" + -DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)" + ) else fft_opts=( -DGMX_FFT_LIBRARY=fftpack ) fi