diff options
| author |   Jauhien Piatlicki <jauhien@gentoo.org> | 2014-09-04 18:12:05 +0200 |
|---|---|---|
| committer | Jauhien Piatlicki <jauhien@gentoo.org> | 2014-09-04 18:12:05 +0200 |
| commit | 6d416e13729a06515f1bda01bda772d2d4f19413 (patch) | |
| tree | fbcf09986e8fbc5a0f77ed1ec722e7ea8bde4fd2 | |
| parent | sci-physics/tauola: fix doc building failure for 1.1.5 (diff) | |
| parent | sync with gx86 (diff) | |
| download | sci-6d416e13729a06515f1bda01bda772d2d4f19413.tar.gz sci-6d416e13729a06515f1bda01bda772d2d4f19413.tar.bz2 sci-6d416e13729a06515f1bda01bda772d2d4f19413.zip | |
Merge remote-tracking branch 'gentoo/master'
| -rw-r--r-- | sci-chemistry/gromacs/ChangeLog | 3 | ||||
| -rw-r--r-- | sci-chemistry/gromacs/gromacs-5.0.9999.ebuild | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog index 2b74e156b..dbc7446a5 100644 --- a/sci-chemistry/gromacs/ChangeLog +++ b/sci-chemistry/gromacs/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 Sep 2014; Christoph Junghans <ottxor@gentoo.org> gromacs-5.0.9999.ebuild: + sync with gx86 + 03 Sep 2014; Christoph Junghans <ottxor@gentoo.org> -Manifest, -gromacs-5.0_rc1.ebuild: drop old diff --git a/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild b/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild index 92152a345..042eb28d2 100644 --- a/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild @@ -21,7 +21,7 @@ if [[ $PV = *9999* ]]; then else SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-${TEST_PV}.tar.gz )" - KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" + KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" fi ACCE_IUSE="sse2 sse4_1 avx_128_fma avx_256 avx2_256" @@ -189,6 +189,8 @@ src_configure() { -DGMX_LIBS_SUFFIX="${suffix}" ) BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure + [[ ${CHOST} != *-darwin* ]] || \ + sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die use mpi || continue einfo "Configuring for ${x} precision with mpi" mycmakeargs=( @@ -203,6 +205,8 @@ src_configure() { -DGMX_LIBS_SUFFIX="_mpi${suffix}" ) BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure + [[ ${CHOST} != *-darwin* ]] || \ + sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die done } |