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 08212198005 for ; Sun, 10 Mar 2013 01:05:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8C3E0E0605; Sun, 10 Mar 2013 01:05:00 +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 18BD0E0605 for ; Sun, 10 Mar 2013 01:05:00 +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 2E29B33DE50 for ; Sun, 10 Mar 2013 01:04:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C0526E4073 for ; Sun, 10 Mar 2013 01:04:57 +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: <1362877481.c3db2a4a04c738a9f4c18b00688e384b4ec3f741.ottxor@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: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: c3db2a4a04c738a9f4c18b00688e384b4ec3f741 X-VCS-Branch: master Date: Sun, 10 Mar 2013 01:04:57 +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: 5c820149-0ac9-4599-a523-d9658aec5909 X-Archives-Hash: a592c8b1b821a00f6dd16cf832a8be07 commit: c3db2a4a04c738a9f4c18b00688e384b4ec3f741 Author: Christoph Junghans gentoo org> AuthorDate: Sun Mar 10 01:04:41 2013 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Sun Mar 10 01:04:41 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c3db2a4a added cuda build fix from gx86 Package-Manager: portage-2.2.0_alpha166 --- sci-chemistry/gromacs/ChangeLog | 3 +++ sci-chemistry/gromacs/gromacs-4.6.9999.ebuild | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog index 89d1580..bc0c784 100644 --- a/sci-chemistry/gromacs/ChangeLog +++ b/sci-chemistry/gromacs/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 10 Mar 2013; Christoph Junghans gromacs-4.6.9999.ebuild: + added cuda build fix from gx86 + 09 Mar 2013; Christoph Junghans gromacs-4.6.9999.ebuild: fixed deps + doc build on darwin diff --git a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild index 4d79e52..ca14997 100644 --- a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild @@ -181,10 +181,11 @@ src_configure() { [[ ${x} = "double" ]] && suffix="_d" local p [[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF" - local cuda=$(cmake-utils_use cuda GMX_GPU) - [[ ${x} = "double" ]] && use cuda && cuda="-DGMX_GPU=OFF" + local cuda=( "-DGMX_GPU=OFF" ) + [[ ${x} = "single" ]] && use cuda && \ + cuda=( -DGMX_GPU=ON -DCUDA_HOST_COMPILER_OPTIONS="${NVCCFLAGS}" ) mycmakeargs=( ${mycmakeargs_pre[@]} ${p} -DGMX_MPI=OFF - $(cmake-utils_use threads GMX_THREAD_MPI) ${cuda} -DGMX_OPENMM=OFF + $(cmake-utils_use threads GMX_THREAD_MPI) "${cuda[@]}" -DGMX_OPENMM=OFF "$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")" -DGMX_BINARY_SUFFIX="${suffix}" -DGMX_LIBS_SUFFIX="${suffix}" ) BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure